netsurf: branch master updated. release/3.5-140-gaa53519
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/aa53519bcd5b716306e0f...
...commit http://git.netsurf-browser.org/netsurf.git/commit/aa53519bcd5b716306e0fb0...
...tree http://git.netsurf-browser.org/netsurf.git/tree/aa53519bcd5b716306e0fb0ec...
The branch, master has been updated
via aa53519bcd5b716306e0fb0ec2a89d953128bc85 (commit)
from 667605869fba31c48e61736f89efe4126d27db0c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=aa53519bcd5b716306e...
commit aa53519bcd5b716306e0fb0ec2a89d953128bc85
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
fix missing includes from header API changes
diff --git a/desktop/plot_style.h b/desktop/plot_style.h
index af54e79..347c6e8 100644
--- a/desktop/plot_style.h
+++ b/desktop/plot_style.h
@@ -113,7 +113,7 @@ typedef enum {
/**
* Plot style for stroke/fill plotters
*/
-typedef struct {
+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 */
diff --git a/frontends/atari/plot/plot.h b/frontends/atari/plot/plot.h
index 22f8781..fd73a8c 100644
--- a/frontends/atari/plot/plot.h
+++ b/frontends/atari/plot/plot.h
@@ -54,6 +54,8 @@
#define ERR_NO_MEM 2 /* Not enough memory for requested operation */
#define ERR_PLOTTER_NOT_AVAILABLE 3 /* invalid plotter driver name passed */
+struct plot_style_s;
+
struct s_vdi_sysinfo {
short vdi_handle; /**< vdi handle */
short scr_w; /**< resolution horz. */
@@ -104,8 +106,8 @@ void plot_get_clip_grect(GRECT * out);
bool plot_clip(const struct rect *clip);
VdiHdl plot_get_vdi_handle(void);
long plot_get_flags(void);
-bool plot_rectangle( int x0, int y0, int x1, int y1,const plot_style_t *style );
-bool plot_line( int x0, int y0, int x1, int y1, const plot_style_t *style );
+bool plot_rectangle( int x0, int y0, int x1, int y1,const struct plot_style_s *style );
+bool plot_line( int x0, int y0, int x1, int y1, const struct plot_style_s *style );
bool plot_blit_bitmap(struct bitmap * bmp, int x, int y,
unsigned long bg, unsigned long flags);
bool plot_blit_mfdb(GRECT * loc, MFDB * insrc, short fgcolor, uint32_t flags);
diff --git a/frontends/framebuffer/fbtk.h b/frontends/framebuffer/fbtk.h
index 6ad06ed..fe4f5a5 100644
--- a/frontends/framebuffer/fbtk.h
+++ b/frontends/framebuffer/fbtk.h
@@ -19,6 +19,8 @@
#ifndef NETSURF_FB_FBTK_H
#define NETSURF_FB_FBTK_H
+#include "desktop/plot_style.h"
+
#ifdef FBTK_LOGGING
#define FBTK_LOG(x) LOG(x)
#else
diff --git a/frontends/windows/drawable.c b/frontends/windows/drawable.c
index 39ecee0..74aca15 100644
--- a/frontends/windows/drawable.c
+++ b/frontends/windows/drawable.c
@@ -17,18 +17,19 @@
*/
#include <stdbool.h>
+#include <stdint.h>
#include "utils/config.h"
#include <windows.h>
#include <windowsx.h>
-#include "netsurf/browser_window.h"
-#include "desktop/textinput.h"
-#include "netsurf/plotters.h"
#include "utils/errors.h"
#include "utils/log.h"
#include "utils/utils.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/plotters.h"
+#include "desktop/textinput.h"
#include "windows/windbg.h"
#include "windows/plot.h"
-----------------------------------------------------------------------
Summary of changes:
desktop/plot_style.h | 2 +-
frontends/atari/plot/plot.h | 6 ++++--
frontends/framebuffer/fbtk.h | 2 ++
frontends/windows/drawable.c | 7 ++++---
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/desktop/plot_style.h b/desktop/plot_style.h
index af54e79..347c6e8 100644
--- a/desktop/plot_style.h
+++ b/desktop/plot_style.h
@@ -113,7 +113,7 @@ typedef enum {
/**
* Plot style for stroke/fill plotters
*/
-typedef struct {
+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 */
diff --git a/frontends/atari/plot/plot.h b/frontends/atari/plot/plot.h
index 22f8781..fd73a8c 100644
--- a/frontends/atari/plot/plot.h
+++ b/frontends/atari/plot/plot.h
@@ -54,6 +54,8 @@
#define ERR_NO_MEM 2 /* Not enough memory for requested operation */
#define ERR_PLOTTER_NOT_AVAILABLE 3 /* invalid plotter driver name passed */
+struct plot_style_s;
+
struct s_vdi_sysinfo {
short vdi_handle; /**< vdi handle */
short scr_w; /**< resolution horz. */
@@ -104,8 +106,8 @@ void plot_get_clip_grect(GRECT * out);
bool plot_clip(const struct rect *clip);
VdiHdl plot_get_vdi_handle(void);
long plot_get_flags(void);
-bool plot_rectangle( int x0, int y0, int x1, int y1,const plot_style_t *style );
-bool plot_line( int x0, int y0, int x1, int y1, const plot_style_t *style );
+bool plot_rectangle( int x0, int y0, int x1, int y1,const struct plot_style_s *style );
+bool plot_line( int x0, int y0, int x1, int y1, const struct plot_style_s *style );
bool plot_blit_bitmap(struct bitmap * bmp, int x, int y,
unsigned long bg, unsigned long flags);
bool plot_blit_mfdb(GRECT * loc, MFDB * insrc, short fgcolor, uint32_t flags);
diff --git a/frontends/framebuffer/fbtk.h b/frontends/framebuffer/fbtk.h
index 6ad06ed..fe4f5a5 100644
--- a/frontends/framebuffer/fbtk.h
+++ b/frontends/framebuffer/fbtk.h
@@ -19,6 +19,8 @@
#ifndef NETSURF_FB_FBTK_H
#define NETSURF_FB_FBTK_H
+#include "desktop/plot_style.h"
+
#ifdef FBTK_LOGGING
#define FBTK_LOG(x) LOG(x)
#else
diff --git a/frontends/windows/drawable.c b/frontends/windows/drawable.c
index 39ecee0..74aca15 100644
--- a/frontends/windows/drawable.c
+++ b/frontends/windows/drawable.c
@@ -17,18 +17,19 @@
*/
#include <stdbool.h>
+#include <stdint.h>
#include "utils/config.h"
#include <windows.h>
#include <windowsx.h>
-#include "netsurf/browser_window.h"
-#include "desktop/textinput.h"
-#include "netsurf/plotters.h"
#include "utils/errors.h"
#include "utils/log.h"
#include "utils/utils.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/plotters.h"
+#include "desktop/textinput.h"
#include "windows/windbg.h"
#include "windows/plot.h"
--
NetSurf Browser
7Â years, 4Â months
- 1
- 0
netsurf: branch master updated. release/3.5-139-g6676058
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/667605869fba31c48e617...
...commit http://git.netsurf-browser.org/netsurf.git/commit/667605869fba31c48e61736...
...tree http://git.netsurf-browser.org/netsurf.git/tree/667605869fba31c48e61736f8...
The branch, master has been updated
via 667605869fba31c48e61736f89efe4126d27db0c (commit)
via 7fc0a4c481d7adad14a42740037d50b2f9e1cdc1 (commit)
via 8711fbe47dd0381efd09717b719b79be3d819f49 (commit)
via a996bee9facdce826c5fc3a819dd0ce362d80e95 (commit)
via c041393e66b4a75cfc1165e184be77cc974a63cb (commit)
via 9ce71876ce500e242e2384c21abb38a8f431138b (commit)
via 527756cca0471a55389a3494d35f9b1b13f20b7e (commit)
via fe7eb85614244d5e0659c88431fbd9726fa33051 (commit)
via aa5090c85b6890f79d340ad2de6219237f2d6c4c (commit)
via c821ed2bbd91e1b4fe2b74c01cce1a4106f37655 (commit)
via d240bec03627f5a26cd70e83a58483c69834f7c2 (commit)
via 1eb86d9df2d6897d11b712f21d4ac23390fbdc70 (commit)
via 903c4dbef9fae1e24a66a8ff7b745c799f6726cd (commit)
from 2dab078f21db7dec5a29079daf9a5f0a06a6e0bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=667605869fba31c48e6...
commit 667605869fba31c48e61736f89efe4126d27db0c
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
move plotters header into public API
diff --git a/content/content.c b/content/content.c
index 36e3e79..888202e 100644
--- a/content/content.c
+++ b/content/content.c
@@ -28,7 +28,6 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/plotters.h"
#include "desktop/knockout.h"
#include "desktop/gui_internal.h"
#include "netsurf/browser_window.h"
diff --git a/content/handlers/image/bmp.c b/content/handlers/image/bmp.c
index e108b48..114a551 100644
--- a/content/handlers/image/bmp.c
+++ b/content/handlers/image/bmp.c
@@ -30,7 +30,7 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/bitmap.h"
#include "bmp.h"
diff --git a/content/handlers/image/image.c b/content/handlers/image/image.c
index 487b35b..da5eea1 100644
--- a/content/handlers/image/image.c
+++ b/content/handlers/image/image.c
@@ -23,7 +23,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "content/content.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/gui_internal.h"
#include "netsurf/bitmap.h"
diff --git a/content/handlers/image/nssprite.c b/content/handlers/image/nssprite.c
index 082bf9e..8912f83 100644
--- a/content/handlers/image/nssprite.c
+++ b/content/handlers/image/nssprite.c
@@ -30,7 +30,7 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/bitmap.h"
#include "nssprite.h"
diff --git a/content/handlers/image/rsvg.c b/content/handlers/image/rsvg.c
index dce1ea9..9842d45 100644
--- a/content/handlers/image/rsvg.c
+++ b/content/handlers/image/rsvg.c
@@ -42,7 +42,7 @@
#include "utils/utils.h"
#include "utils/messages.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/gui_internal.h"
#include "netsurf/bitmap.h"
diff --git a/content/handlers/image/svg.c b/content/handlers/image/svg.c
index 3eff684..82c85ac 100644
--- a/content/handlers/image/svg.c
+++ b/content/handlers/image/svg.c
@@ -30,7 +30,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "svg.h"
diff --git a/desktop/browser.c b/desktop/browser.c
index 6b3746f..c0db76a 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -68,7 +68,7 @@
#include "desktop/knockout.h"
#include "desktop/scrollbar.h"
#include "desktop/selection.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/theme.h"
#include "netsurf/misc.h"
#include "netsurf/window.h"
diff --git a/desktop/browser_history.c b/desktop/browser_history.c
index 79a921a..a8c8ee0 100644
--- a/desktop/browser_history.c
+++ b/desktop/browser_history.c
@@ -40,7 +40,7 @@
#include "desktop/gui_internal.h"
#include "desktop/browser_history.h"
#include "desktop/browser_private.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#define WIDTH 100
#define HEIGHT 86
diff --git a/desktop/knockout.c b/desktop/knockout.c
index a20ec28..b930ef6 100644
--- a/desktop/knockout.c
+++ b/desktop/knockout.c
@@ -74,7 +74,7 @@
#include "desktop/gui_internal.h"
#include "desktop/knockout.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
/* Define to enable knockout debug */
#undef KNOCKOUT_DEBUG
diff --git a/desktop/knockout.h b/desktop/knockout.h
index a6b61d8..c4f1245 100644
--- a/desktop/knockout.h
+++ b/desktop/knockout.h
@@ -23,7 +23,7 @@
#ifndef _NETSURF_DESKTOP_KNOCKOUT_H_
#define _NETSURF_DESKTOP_KNOCKOUT_H_
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
bool knockout_plot_start(const struct redraw_context *ctx,
diff --git a/desktop/plot_style.c b/desktop/plot_style.c
index 05e42ba..f9ba4bc 100644
--- a/desktop/plot_style.c
+++ b/desktop/plot_style.c
@@ -23,7 +23,7 @@
* These plot styles are globaly available and used in many places.
*/
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
static plot_style_t plot_style_fill_white_static = {
.fill_type = PLOT_OP_TYPE_SOLID,
diff --git a/desktop/plotters.h b/desktop/plotters.h
deleted file mode 100644
index d764de2..0000000
--- a/desktop/plotters.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright 2004 James Bursa <bursa(a)users.sourceforge.net>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-/** \file
- * Target independent plotting (interface).
- */
-
-#ifndef _NETSURF_DESKTOP_PLOTTERS_H_
-#define _NETSURF_DESKTOP_PLOTTERS_H_
-
-#include <stdbool.h>
-#include <stdio.h>
-
-#include "desktop/plot_style.h"
-
-struct bitmap;
-struct rect;
-
-typedef unsigned long bitmap_flags_t;
-#define BITMAPF_NONE 0
-#define BITMAPF_REPEAT_X 1
-#define BITMAPF_REPEAT_Y 2
-
-enum path_command {
- PLOTTER_PATH_MOVE,
- PLOTTER_PATH_CLOSE,
- PLOTTER_PATH_LINE,
- PLOTTER_PATH_BEZIER,
-};
-
-/** Set of target specific plotting functions.
- *
- * The functions are:
- * arc - Plots an arc, around (x,y), from anticlockwise from angle1 to
- * angle2. Angles are measured anticlockwise from horizontal, in
- * degrees.
- * disc - Plots a circle, centered on (x,y), which is optionally filled.
- * line - Plots a line from (x0,y0) to (x1,y1). Coordinates are at
- * centre of line width/thickness.
- * path - Plots a path consisting of cubic Bezier curves. Line colour is
- * given by c and fill colour is given by fill.
- * polygon - Plots a filled polygon with straight lines between points.
- * The lines around the edge of the ploygon are not plotted. The
- * polygon is filled with the non-zero winding rule.
- * rectangle - Plots a rectangle outline. The line can be solid, dotted or
- * dashed. Top left corner at (x0,y0) and rectangle has given
- * width and height.
- * fill - Plots a filled rectangle. Top left corner at (x0,y0), bottom
- * right corner at (x1,y1). Note: (x0,y0) is inside filled area,
- * but (x1,y1) is below and to the right. See diagram below.
- * clip - Sets a clip rectangle for subsequent plots.
- * text - Plots text. (x,y) is the coordinate of the left hand side of
- * the text's baseline. The text is UTF-8 encoded. The colour, c,
- * is the colour of the text. Background colour, bg, may be used
- * optionally to attempt to provide anti-aliased text without
- * screen reads. Font information is provided in the style.
- * bitmap - Tiled plot of a bitmap image. (x,y) gives the top left
- * coordinate of an explicitly placed tile. From this tile the
- * image can repeat in all four directions -- up, down, left and
- * right -- to the extents given by the current clip rectangle.
- * The bitmap_flags say whether to tile in the x and y
- * directions. If not tiling in x or y directions, the single
- * image is plotted. The width and height give the dimensions
- * the image is to be scaled to.
- * group_start - Start of a group of objects. Used when plotter implements
- * export to a vector graphics file format. (Optional.)
- * group_end - End of the most recently started group. (Optional.)
- * flush - Only used internally by the knockout code. Should be NULL in
- * any front end display plotters or export plotters.
- *
- * Plotter options:
- * option_knockout - Optimisation particularly for unaccelerated screen
- * redraw. It tries to avoid plotting to the same area
- * more than once. See desktop/knockout.c
- *
- * Coordinates are from top left of canvas and (0,0) is the top left grid
- * denomination. If a "fill" is drawn from (0,0) to (4,3), the result is:
- *
- * 0 1 2 3 4 5
- * +-+-+-+-+-+-
- * 0 |#|#|#|#| |
- * +-+-+-+-+-+-
- * 1 |#|#|#|#| |
- * +-+-+-+-+-+-
- * 2 |#|#|#|#| |
- * +-+-+-+-+-+-
- * 3 | | | | | |
- */
-struct plotter_table {
- /* clipping operations */
- bool (*clip)(const struct rect *clip);
-
- /* shape primatives */
- bool (*arc)(int x, int y, int radius, int angle1, int angle2, const plot_style_t *pstyle);
- bool (*disc)(int x, int y, int radius, const plot_style_t *pstyle);
- bool (*line)(int x0, int y0, int x1, int y1, const plot_style_t *pstyle);
- bool (*rectangle)(int x0, int y0, int x1, int y1, const plot_style_t *pstyle);
- bool (*polygon)(const int *p, unsigned int n, const plot_style_t *pstyle);
-
- /* complex path (for SVG) */
- bool (*path)(const float *p, unsigned int n, colour fill, float width,
- colour c, const float transform[6]);
-
- /* Image */
- bool (*bitmap)(int x, int y, int width, int height,
- struct bitmap *bitmap, colour bg,
- bitmap_flags_t flags);
-
- /**
- * Text.
- *
- * \param x x coordinate
- * \param y y coordinate
- * \param text UTF-8 string to plot
- * \param length length of string, in bytes
- * \param fstyle plot style for this text
- * \return true on success, false on error and error reported
- */
- bool (*text)(int x, int y, const char *text, size_t length,
- const plot_font_style_t *fstyle);
-
- /* optional callbacks */
- bool (*group_start)(const char *name); /**< optional, may be NULL */
- bool (*group_end)(void); /**< optional, may be NULL */
- bool (*flush)(void); /**< optional, may be NULL */
-
- /* flags */
- bool option_knockout; /**< set if knockout rendering is required */
-};
-
-
-/* Redraw context */
-struct redraw_context {
- /** Redraw to show interactive features, such as active selections
- * etc. Should be off for printing. */
- bool interactive;
-
- /** Render background images. May want it off for printing. */
- bool background_images;
-
- /** Current plotters, must be assigned before use. */
- const struct plotter_table *plot;
-};
-
-#endif
diff --git a/desktop/print.c b/desktop/print.c
index c3cfefc..8daec88 100644
--- a/desktop/print.c
+++ b/desktop/print.c
@@ -35,7 +35,7 @@
#include "content/handlers/css/utils.h"
#include "render/box.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/print.h"
#include "desktop/printer.h"
diff --git a/desktop/save_pdf.c b/desktop/save_pdf.c
index 0c870b4..d303eca 100644
--- a/desktop/save_pdf.c
+++ b/desktop/save_pdf.c
@@ -62,7 +62,7 @@
#include "utils/nsoption.h"
#include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/print.h"
#include "desktop/printer.h"
diff --git a/desktop/scrollbar.c b/desktop/scrollbar.c
index 740fd33..b9e963a 100644
--- a/desktop/scrollbar.c
+++ b/desktop/scrollbar.c
@@ -34,7 +34,7 @@
#include "desktop/system_colour.h"
#include "netsurf/mouse.h"
#include "desktop/scrollbar.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/plot_style.h"
diff --git a/desktop/selection.c b/desktop/selection.c
index 7c1d15c..b2c7837 100644
--- a/desktop/selection.c
+++ b/desktop/selection.c
@@ -39,7 +39,7 @@
#include "netsurf/mouse.h"
#include "desktop/browser_private.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/save_text.h"
#include "desktop/selection.h"
#include "netsurf/clipboard.h"
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 8c9efe1..5d18709 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -35,7 +35,7 @@
#include "netsurf/mouse.h"
#include "desktop/textarea.h"
#include "desktop/textinput.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/scrollbar.h"
#include "netsurf/clipboard.h"
#include "netsurf/layout.h"
diff --git a/desktop/treeview.c b/desktop/treeview.c
index ead0510..4fa0544 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -29,7 +29,7 @@
#include "desktop/system_colour.h"
#include "desktop/knockout.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/textarea.h"
#include "desktop/treeview.h"
#include "netsurf/clipboard.h"
diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c
index 2d86307..bcdc51c 100644
--- a/frontends/amiga/clipboard.c
+++ b/frontends/amiga/clipboard.c
@@ -32,7 +32,7 @@
#include "utils/nsurl.h"
#include "content/hlcache.h"
#include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/textinput.h"
#include "netsurf/window.h"
#include "netsurf/clipboard.h"
diff --git a/frontends/amiga/dt_anim.c b/frontends/amiga/dt_anim.c
index fec7076..c177321 100644
--- a/frontends/amiga/dt_anim.c
+++ b/frontends/amiga/dt_anim.c
@@ -38,7 +38,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/bitmap.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/dt_picture.c b/frontends/amiga/dt_picture.c
index aba0893..49dde5e 100644
--- a/frontends/amiga/dt_picture.c
+++ b/frontends/amiga/dt_picture.c
@@ -34,7 +34,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/bitmap.h"
#include "content/handlers/image/image_cache.h"
diff --git a/frontends/amiga/dt_sound.c b/frontends/amiga/dt_sound.c
index fe1b1fc..04486c1 100644
--- a/frontends/amiga/dt_sound.c
+++ b/frontends/amiga/dt_sound.c
@@ -26,7 +26,7 @@
#include "amiga/filetype.h"
#include "amiga/datatypes.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "render/box.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/frontends/amiga/font.h b/frontends/amiga/font.h
index cd52605..5e07211 100755
--- a/frontends/amiga/font.h
+++ b/frontends/amiga/font.h
@@ -19,7 +19,7 @@
#ifndef AMIGA_FONT_H
#define AMIGA_FONT_H
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/errors.h"
#include <graphics/rastport.h>
#include <graphics/text.h>
diff --git a/frontends/amiga/history_local.c b/frontends/amiga/history_local.c
index a1ada5b..3a6cbe4 100755
--- a/frontends/amiga/history_local.c
+++ b/frontends/amiga/history_local.c
@@ -46,7 +46,7 @@
#include "utils/messages.h"
#include "desktop/browser_history.h"
#include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/window.h"
#include "graphics/rpattr.h"
diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c
index 819879d..201ce5f 100644
--- a/frontends/amiga/icon.c
+++ b/frontends/amiga/icon.c
@@ -41,7 +41,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "utils/file.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/bitmap.h"
#include "content/content_protected.h"
diff --git a/frontends/amiga/plotters.h b/frontends/amiga/plotters.h
index 7baa21f..8fa2b06 100644
--- a/frontends/amiga/plotters.h
+++ b/frontends/amiga/plotters.h
@@ -18,7 +18,7 @@
#ifndef AMIGA_PLOTTERS_H
#define AMIGA_PLOTTERS_H
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include <proto/layers.h>
#include <proto/graphics.h>
diff --git a/frontends/amiga/plugin_hack.c b/frontends/amiga/plugin_hack.c
index 21f4da1..19fa66c 100644
--- a/frontends/amiga/plugin_hack.c
+++ b/frontends/amiga/plugin_hack.c
@@ -28,7 +28,7 @@
#include "amiga/plugin_hack.h"
#include "content/content_protected.h"
#include "content/hlcache.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c
index f4cd314..007245c 100644
--- a/frontends/amiga/print.c
+++ b/frontends/amiga/print.c
@@ -49,7 +49,7 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
#include "utils/utils.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/printer.h"
#include "desktop/print.h"
#include "netsurf/layout.h"
diff --git a/frontends/atari/cookies.c b/frontends/atari/cookies.c
index eff4ad8..78b8d60 100644
--- a/frontends/atari/cookies.c
+++ b/frontends/atari/cookies.c
@@ -21,7 +21,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "netsurf/mouse.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/cookie_manager.h"
#include "desktop/core_window.h"
diff --git a/frontends/atari/font.c b/frontends/atari/font.c
index a90b795..85fecce 100644
--- a/frontends/atari/font.c
+++ b/frontends/atari/font.c
@@ -26,7 +26,7 @@
#include "utils/nsoption.h"
#include "netsurf/layout.h"
#include "netsurf/mouse.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "atari/gui.h"
#include "atari/plot/fontplot.h"
diff --git a/frontends/atari/plot/plot.c b/frontends/atari/plot/plot.c
index 2e35bcd..3a87802 100644
--- a/frontends/atari/plot/plot.c
+++ b/frontends/atari/plot/plot.c
@@ -30,7 +30,7 @@
#include "utils/utf8.h"
#include "utils/utils.h"
#include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/mouse.h"
#include "atari/gui.h"
diff --git a/frontends/atari/rootwin.c b/frontends/atari/rootwin.c
index 5a5bdcc..d309f8d 100644
--- a/frontends/atari/rootwin.c
+++ b/frontends/atari/rootwin.c
@@ -39,7 +39,7 @@
#include "utils/log.h"
#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/textinput.h"
#include "content/content.h"
#include "content/hlcache.h"
diff --git a/frontends/atari/statusbar.c b/frontends/atari/statusbar.c
index c05e1b4..3a216f9 100644
--- a/frontends/atari/statusbar.c
+++ b/frontends/atari/statusbar.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "netsurf/mouse.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "atari/gui.h"
#include "atari/statusbar.h"
diff --git a/frontends/atari/toolbar.c b/frontends/atari/toolbar.c
index 2a50538..27d7b53 100644
--- a/frontends/atari/toolbar.c
+++ b/frontends/atari/toolbar.c
@@ -35,7 +35,7 @@
#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/plot_style.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/tree.h"
#include "desktop/hotlist.h"
#include "desktop/textarea.h"
diff --git a/frontends/atari/treeview.c b/frontends/atari/treeview.c
index b474298..1048fb0 100644
--- a/frontends/atari/treeview.c
+++ b/frontends/atari/treeview.c
@@ -28,7 +28,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/urldb.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/mouse.h"
#include "desktop/treeview.h"
diff --git a/frontends/beos/bitmap.cpp b/frontends/beos/bitmap.cpp
index 3287fd0..4ce4075 100644
--- a/frontends/beos/bitmap.cpp
+++ b/frontends/beos/bitmap.cpp
@@ -40,7 +40,7 @@ extern "C" {
#include "utils/log.h"
#include "content/content.h"
#include "content/urldb.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/browser_window.h"
#include "netsurf/bitmap.h"
}
diff --git a/frontends/beos/cookies.cpp b/frontends/beos/cookies.cpp
index bf8ce51..d4c8e5b 100644
--- a/frontends/beos/cookies.cpp
+++ b/frontends/beos/cookies.cpp
@@ -24,7 +24,7 @@ extern "C" {
#include "netsurf/mouse.h"
#include "utils/log.h"
#include "desktop/cookie_manager.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/tree.h"
#include "desktop/textinput.h"
#include "content/urldb.h"
diff --git a/frontends/beos/plotters.cpp b/frontends/beos/plotters.cpp
index 3fd786e..5ba3fbb 100644
--- a/frontends/beos/plotters.cpp
+++ b/frontends/beos/plotters.cpp
@@ -31,7 +31,7 @@
#include <View.h>
#include <Shape.h>
extern "C" {
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/log.h"
#include "utils/utils.h"
#include "utils/nsoption.h"
diff --git a/frontends/beos/scaffolding.cpp b/frontends/beos/scaffolding.cpp
index 75ef241..6cb9a77 100644
--- a/frontends/beos/scaffolding.cpp
+++ b/frontends/beos/scaffolding.cpp
@@ -59,7 +59,7 @@ extern "C" {
#include "desktop/version.h"
#include "desktop/searchweb.h"
#include "desktop/search.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/nsoption.h"
#include "desktop/textinput.h"
#include "render/form.h"
diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp
index 4fd6823..237d92a 100644
--- a/frontends/beos/window.cpp
+++ b/frontends/beos/window.cpp
@@ -32,7 +32,7 @@ extern "C" {
#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/textinput.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/window.h"
#include "netsurf/clipboard.h"
}
diff --git a/frontends/cocoa/BrowserView.m b/frontends/cocoa/BrowserView.m
index 5d82c85..db1c249 100644
--- a/frontends/cocoa/BrowserView.m
+++ b/frontends/cocoa/BrowserView.m
@@ -19,7 +19,7 @@
#import "utils/nsoption.h"
#import "utils/messages.h"
#import "netsurf/browser_window.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
#import "desktop/textinput.h"
#import "content/hlcache.h"
diff --git a/frontends/cocoa/HistoryView.m b/frontends/cocoa/HistoryView.m
index 7b19233..bead8db 100644
--- a/frontends/cocoa/HistoryView.m
+++ b/frontends/cocoa/HistoryView.m
@@ -24,7 +24,7 @@
#import "cocoa/BrowserView.h"
#import "desktop/browser_history.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
@implementation HistoryView
diff --git a/frontends/cocoa/NetsurfApp.m b/frontends/cocoa/NetsurfApp.m
index c30bce0..a8619e0 100644
--- a/frontends/cocoa/NetsurfApp.m
+++ b/frontends/cocoa/NetsurfApp.m
@@ -33,7 +33,7 @@
#import "utils/utils.h"
#import "content/urldb.h"
#import "utils/nsoption.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
#import "desktop/save_complete.h"
#import "desktop/textinput.h"
#import "desktop/tree.h"
diff --git a/frontends/cocoa/Tree.m b/frontends/cocoa/Tree.m
index 5cd796c..359d543 100644
--- a/frontends/cocoa/Tree.m
+++ b/frontends/cocoa/Tree.m
@@ -21,7 +21,7 @@
#import "cocoa/font.h"
#import "cocoa/plotter.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
#import "desktop/tree.h"
@implementation Tree
diff --git a/frontends/cocoa/TreeView.m b/frontends/cocoa/TreeView.m
index a58a496..71f5af4 100644
--- a/frontends/cocoa/TreeView.m
+++ b/frontends/cocoa/TreeView.m
@@ -19,7 +19,7 @@
#import "cocoa/TreeView.h"
#import "cocoa/Tree.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
#import "desktop/textinput.h"
@interface TreeView () <TreeDelegate>
diff --git a/frontends/cocoa/apple_image.m b/frontends/cocoa/apple_image.m
index 896cf4c..5c82a2b 100644
--- a/frontends/cocoa/apple_image.m
+++ b/frontends/cocoa/apple_image.m
@@ -23,7 +23,7 @@
#include "utils/config.h"
#include "content/content_protected.h"
#include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/utils.h"
#import "cocoa/schedule.h"
diff --git a/frontends/cocoa/bitmap.m b/frontends/cocoa/bitmap.m
index f7c28f0..dd9e33f 100644
--- a/frontends/cocoa/bitmap.m
+++ b/frontends/cocoa/bitmap.m
@@ -24,7 +24,7 @@
#import <Cocoa/Cocoa.h>
#import "netsurf/browser_window.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
#import "netsurf/bitmap.h"
#import "content/urldb.h"
#import "content/content.h"
diff --git a/frontends/cocoa/font.m b/frontends/cocoa/font.m
index 7b594b6..483d989 100644
--- a/frontends/cocoa/font.m
+++ b/frontends/cocoa/font.m
@@ -23,7 +23,7 @@
#import "utils/nsoption.h"
#import "netsurf/layout.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
static NSLayoutManager *cocoa_prepare_layout_manager( const char *string, size_t length,
diff --git a/frontends/cocoa/plotter.m b/frontends/cocoa/plotter.m
index 472857d..2b721bf 100644
--- a/frontends/cocoa/plotter.m
+++ b/frontends/cocoa/plotter.m
@@ -21,7 +21,7 @@
#import "utils/log.h"
#import "utils/utils.h"
#import "netsurf/browser_window.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
#import "desktop/plot_style.h"
#import "cocoa/font.h"
diff --git a/frontends/framebuffer/bitmap.c b/frontends/framebuffer/bitmap.c
index df99e71..dbe5647 100644
--- a/frontends/framebuffer/bitmap.c
+++ b/frontends/framebuffer/bitmap.c
@@ -31,7 +31,7 @@
#include "utils/log.h"
#include "utils/utils.h"
#include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "content/content.h"
#include "framebuffer/gui.h"
diff --git a/frontends/framebuffer/fbtk/fbtk.c b/frontends/framebuffer/fbtk/fbtk.c
index fa861b1..c63a6d8 100644
--- a/frontends/framebuffer/fbtk/fbtk.c
+++ b/frontends/framebuffer/fbtk/fbtk.c
@@ -35,7 +35,7 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fbtk/text.c b/frontends/framebuffer/fbtk/text.c
index 703a10b..00dcba4 100644
--- a/frontends/framebuffer/fbtk/text.c
+++ b/frontends/framebuffer/fbtk/text.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/framebuffer.c b/frontends/framebuffer/framebuffer.c
index 00bd6a1..74c72fe 100644
--- a/frontends/framebuffer/framebuffer.c
+++ b/frontends/framebuffer/framebuffer.c
@@ -32,7 +32,7 @@
#include "utils/log.h"
#include "utils/utf8.h"
#include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/bitmap.h"
#include "framebuffer/gui.h"
diff --git a/frontends/framebuffer/gui.c b/frontends/framebuffer/gui.c
index 7559648..7ef64b0 100644
--- a/frontends/framebuffer/gui.c
+++ b/frontends/framebuffer/gui.c
@@ -37,7 +37,7 @@
#include "netsurf/browser_window.h"
#include "desktop/textinput.h"
#include "desktop/browser_history.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/window.h"
#include "netsurf/misc.h"
#include "netsurf/netsurf.h"
diff --git a/frontends/framebuffer/localhistory.c b/frontends/framebuffer/localhistory.c
index 1b2eb9a..3192f07 100644
--- a/frontends/framebuffer/localhistory.c
+++ b/frontends/framebuffer/localhistory.c
@@ -25,7 +25,7 @@
#include <libnsfb_event.h>
#include "desktop/browser_history.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/gtk/bitmap.c b/frontends/gtk/bitmap.c
index ff5a0c4..1def140 100644
--- a/frontends/gtk/bitmap.c
+++ b/frontends/gtk/bitmap.c
@@ -34,7 +34,7 @@
#include "utils/log.h"
#include "content/content.h"
#include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "gtk/scaffolding.h"
#include "gtk/plotters.h"
diff --git a/frontends/gtk/plotters.c b/frontends/gtk/plotters.c
index 1d8c198..1cebf58 100644
--- a/frontends/gtk/plotters.c
+++ b/frontends/gtk/plotters.c
@@ -32,7 +32,7 @@
#include "utils/log.h"
#include "utils/utils.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/nsoption.h"
#include "gtk/layout_pango.h"
diff --git a/frontends/gtk/print.c b/frontends/gtk/print.c
index a6e6399..17cb96f 100644
--- a/frontends/gtk/print.c
+++ b/frontends/gtk/print.c
@@ -36,7 +36,7 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "utils/nsoption.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/print.h"
#include "desktop/printer.h"
diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
index 6873b89..38dfd21 100644
--- a/frontends/gtk/scaffolding.c
+++ b/frontends/gtk/scaffolding.c
@@ -36,7 +36,7 @@
#include "desktop/browser_history.h"
#include "netsurf/browser_window.h"
#include "desktop/hotlist.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/print.h"
#include "desktop/save_complete.h"
#ifdef WITH_PDF_EXPORT
diff --git a/frontends/gtk/treeview.c b/frontends/gtk/treeview.c
index 9baf57b..829e87a 100644
--- a/frontends/gtk/treeview.c
+++ b/frontends/gtk/treeview.c
@@ -33,7 +33,7 @@
#include "utils/log.h"
#include "utils/utf8.h"
#include "desktop/tree.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "gtk/warn.h"
#include "gtk/compat.h"
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index 7cff9ee..dd713cb 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -44,7 +44,7 @@
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
#include "netsurf/window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "render/form.h"
#include "gtk/warn.h"
diff --git a/frontends/monkey/browser.c b/frontends/monkey/browser.c
index 5c1d157..bfabd0f 100644
--- a/frontends/monkey/browser.c
+++ b/frontends/monkey/browser.c
@@ -28,7 +28,7 @@
#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "content/hlcache.h"
#include "monkey/browser.h"
diff --git a/frontends/monkey/plot.c b/frontends/monkey/plot.c
index 50f8124..bd94e75 100644
--- a/frontends/monkey/plot.c
+++ b/frontends/monkey/plot.c
@@ -19,7 +19,7 @@
#include <stdio.h>
#include "utils/utils.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
static bool
monkey_plot_disc(int x, int y, int radius, const plot_style_t *style)
diff --git a/frontends/riscos/bitmap.c b/frontends/riscos/bitmap.c
index 525a230..e0fd38b 100644
--- a/frontends/riscos/bitmap.c
+++ b/frontends/riscos/bitmap.c
@@ -43,7 +43,7 @@
#include "utils/filename.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "content/content.h"
#include "netsurf/bitmap.h"
diff --git a/frontends/riscos/content-handlers/artworks.c b/frontends/riscos/content-handlers/artworks.c
index b6f7a0d..517a6ff 100644
--- a/frontends/riscos/content-handlers/artworks.c
+++ b/frontends/riscos/content-handlers/artworks.c
@@ -37,7 +37,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "riscos/content-handlers/artworks.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/content-handlers/draw.c b/frontends/riscos/content-handlers/draw.c
index f2bee16..0b1b072 100644
--- a/frontends/riscos/content-handlers/draw.c
+++ b/frontends/riscos/content-handlers/draw.c
@@ -34,7 +34,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "riscos/content-handlers/draw.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/content-handlers/sprite.c b/frontends/riscos/content-handlers/sprite.c
index 12fed49..3ef48c8 100644
--- a/frontends/riscos/content-handlers/sprite.c
+++ b/frontends/riscos/content-handlers/sprite.c
@@ -33,7 +33,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "riscos/gui.h"
#include "riscos/image.h"
diff --git a/frontends/riscos/gui/progress_bar.c b/frontends/riscos/gui/progress_bar.c
index 3ec6b3a..c26b46c 100644
--- a/frontends/riscos/gui/progress_bar.c
+++ b/frontends/riscos/gui/progress_bar.c
@@ -30,7 +30,7 @@
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/log.h"
#include "utils/utils.h"
diff --git a/frontends/riscos/gui/status_bar.c b/frontends/riscos/gui/status_bar.c
index cbc4046..9d1bada 100644
--- a/frontends/riscos/gui/status_bar.c
+++ b/frontends/riscos/gui/status_bar.c
@@ -28,7 +28,7 @@
#include "oslib/os.h"
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/log.h"
#include "utils/utils.h"
diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c
index 37c4de1..80a7b4a 100644
--- a/frontends/riscos/gui/url_bar.c
+++ b/frontends/riscos/gui/url_bar.c
@@ -38,7 +38,7 @@
#include "content/hlcache.h"
#include "content/content.h"
#include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "riscos/gui.h"
#include "riscos/hotlist.h"
diff --git a/frontends/riscos/history.c b/frontends/riscos/history.c
index 9d78f6d..de3af08 100644
--- a/frontends/riscos/history.c
+++ b/frontends/riscos/history.c
@@ -31,7 +31,7 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "desktop/browser_history.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "riscos/dialog.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/plotters.c b/frontends/riscos/plotters.c
index 38fd9d7..9c98138 100644
--- a/frontends/riscos/plotters.c
+++ b/frontends/riscos/plotters.c
@@ -28,7 +28,7 @@
#include "utils/log.h"
#include "utils/utils.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "riscos/bitmap.h"
#include "riscos/image.h"
diff --git a/frontends/riscos/print.c b/frontends/riscos/print.c
index 26b50f6..da16664 100644
--- a/frontends/riscos/print.c
+++ b/frontends/riscos/print.c
@@ -39,7 +39,7 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "riscos/gui.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/save_draw.c b/frontends/riscos/save_draw.c
index 50febf3..7ba2c94 100644
--- a/frontends/riscos/save_draw.c
+++ b/frontends/riscos/save_draw.c
@@ -34,7 +34,7 @@
#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "riscos/bitmap.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/toolbar.c b/frontends/riscos/toolbar.c
index 83751a7..2f758f5 100644
--- a/frontends/riscos/toolbar.c
+++ b/frontends/riscos/toolbar.c
@@ -41,7 +41,6 @@
#include "utils/log.h"
#include "utils/nsoption.h"
#include "content/content.h"
-#include "desktop/plotters.h"
#include "riscos/cookies.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/treeview.c b/frontends/riscos/treeview.c
index 83f6066..1cae801 100644
--- a/frontends/riscos/treeview.c
+++ b/frontends/riscos/treeview.c
@@ -40,7 +40,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/urldb.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index 1fc6edf..e99ed31 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -61,7 +61,7 @@
#include "desktop/scrollbar.h"
#include "desktop/frames.h"
#include "netsurf/mouse.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
#include "netsurf/window.h"
diff --git a/frontends/windows/bitmap.c b/frontends/windows/bitmap.c
index a50d9aa..936b28e 100644
--- a/frontends/windows/bitmap.c
+++ b/frontends/windows/bitmap.c
@@ -31,7 +31,7 @@
#include "utils/log.h"
#include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "content/content.h"
#include "windows/plot.h"
diff --git a/frontends/windows/drawable.c b/frontends/windows/drawable.c
index 9c26d8e..39ecee0 100644
--- a/frontends/windows/drawable.c
+++ b/frontends/windows/drawable.c
@@ -25,7 +25,7 @@
#include "netsurf/browser_window.h"
#include "desktop/textinput.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/errors.h"
#include "utils/log.h"
#include "utils/utils.h"
diff --git a/frontends/windows/localhistory.c b/frontends/windows/localhistory.c
index 674f198..ce1877f 100644
--- a/frontends/windows/localhistory.c
+++ b/frontends/windows/localhistory.c
@@ -23,7 +23,7 @@
#include <commctrl.h>
#include "desktop/browser_history.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/frontends/windows/plot.c b/frontends/windows/plot.c
index 7480bc6..941ec41 100644
--- a/frontends/windows/plot.c
+++ b/frontends/windows/plot.c
@@ -30,7 +30,7 @@
#include "utils/utils.h"
#include "netsurf/mouse.h"
#include "netsurf/window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "windows/bitmap.h"
#include "windows/font.h"
diff --git a/include/netsurf/browser_window.h b/include/netsurf/browser_window.h
index 36ed65a..482dcb9 100644
--- a/include/netsurf/browser_window.h
+++ b/include/netsurf/browser_window.h
@@ -22,8 +22,8 @@
* Browser window creation and manipulation interface.
*/
-#ifndef _NETSURF_DESKTOP_BROWSER_H_
-#define _NETSURF_DESKTOP_BROWSER_H_
+#ifndef _NETSURF_BROWSER_WINDOW_H_
+#define _NETSURF_BROWSER_WINDOW_H_
#include <stdbool.h>
#include <stdio.h>
diff --git a/include/netsurf/plotters.h b/include/netsurf/plotters.h
new file mode 100644
index 0000000..b13c9b2
--- /dev/null
+++ b/include/netsurf/plotters.h
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2004 James Bursa <bursa(a)users.sourceforge.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+/**
+ * \file
+ * Target independent plotting interface.
+ */
+
+#ifndef _NETSURF_PLOTTERS_H_
+#define _NETSURF_PLOTTERS_H_
+
+#include <stdbool.h>
+#include <stdio.h>
+
+#include "desktop/plot_style.h"
+
+struct bitmap;
+struct rect;
+
+typedef unsigned long bitmap_flags_t;
+#define BITMAPF_NONE 0
+#define BITMAPF_REPEAT_X 1
+#define BITMAPF_REPEAT_Y 2
+
+enum path_command {
+ PLOTTER_PATH_MOVE,
+ PLOTTER_PATH_CLOSE,
+ PLOTTER_PATH_LINE,
+ PLOTTER_PATH_BEZIER,
+};
+
+/** Set of target specific plotting functions.
+ *
+ * The functions are:
+ * arc - Plots an arc, around (x,y), from anticlockwise from angle1 to
+ * angle2. Angles are measured anticlockwise from horizontal, in
+ * degrees.
+ * disc - Plots a circle, centered on (x,y), which is optionally filled.
+ * line - Plots a line from (x0,y0) to (x1,y1). Coordinates are at
+ * centre of line width/thickness.
+ * path - Plots a path consisting of cubic Bezier curves. Line colour is
+ * given by c and fill colour is given by fill.
+ * polygon - Plots a filled polygon with straight lines between points.
+ * The lines around the edge of the ploygon are not plotted. The
+ * polygon is filled with the non-zero winding rule.
+ * rectangle - Plots a rectangle outline. The line can be solid, dotted or
+ * dashed. Top left corner at (x0,y0) and rectangle has given
+ * width and height.
+ * fill - Plots a filled rectangle. Top left corner at (x0,y0), bottom
+ * right corner at (x1,y1). Note: (x0,y0) is inside filled area,
+ * but (x1,y1) is below and to the right. See diagram below.
+ * clip - Sets a clip rectangle for subsequent plots.
+ * text - Plots text. (x,y) is the coordinate of the left hand side of
+ * the text's baseline. The text is UTF-8 encoded. The colour, c,
+ * is the colour of the text. Background colour, bg, may be used
+ * optionally to attempt to provide anti-aliased text without
+ * screen reads. Font information is provided in the style.
+ * bitmap - Tiled plot of a bitmap image. (x,y) gives the top left
+ * coordinate of an explicitly placed tile. From this tile the
+ * image can repeat in all four directions -- up, down, left and
+ * right -- to the extents given by the current clip rectangle.
+ * The bitmap_flags say whether to tile in the x and y
+ * directions. If not tiling in x or y directions, the single
+ * image is plotted. The width and height give the dimensions
+ * the image is to be scaled to.
+ * group_start - Start of a group of objects. Used when plotter implements
+ * export to a vector graphics file format. (Optional.)
+ * group_end - End of the most recently started group. (Optional.)
+ * flush - Only used internally by the knockout code. Should be NULL in
+ * any front end display plotters or export plotters.
+ *
+ * Plotter options:
+ * option_knockout - Optimisation particularly for unaccelerated screen
+ * redraw. It tries to avoid plotting to the same area
+ * more than once. See desktop/knockout.c
+ *
+ * Coordinates are from top left of canvas and (0,0) is the top left grid
+ * denomination. If a "fill" is drawn from (0,0) to (4,3), the result is:
+ *
+ * 0 1 2 3 4 5
+ * +-+-+-+-+-+-
+ * 0 |#|#|#|#| |
+ * +-+-+-+-+-+-
+ * 1 |#|#|#|#| |
+ * +-+-+-+-+-+-
+ * 2 |#|#|#|#| |
+ * +-+-+-+-+-+-
+ * 3 | | | | | |
+ */
+struct plotter_table {
+ /* clipping operations */
+ bool (*clip)(const struct rect *clip);
+
+ /* shape primatives */
+ bool (*arc)(int x, int y, int radius, int angle1, int angle2, const plot_style_t *pstyle);
+ bool (*disc)(int x, int y, int radius, const plot_style_t *pstyle);
+ bool (*line)(int x0, int y0, int x1, int y1, const plot_style_t *pstyle);
+ bool (*rectangle)(int x0, int y0, int x1, int y1, const plot_style_t *pstyle);
+ bool (*polygon)(const int *p, unsigned int n, const plot_style_t *pstyle);
+
+ /* complex path (for SVG) */
+ bool (*path)(const float *p, unsigned int n, colour fill, float width,
+ colour c, const float transform[6]);
+
+ /* Image */
+ bool (*bitmap)(int x, int y, int width, int height,
+ struct bitmap *bitmap, colour bg,
+ bitmap_flags_t flags);
+
+ /**
+ * Text.
+ *
+ * \param x x coordinate
+ * \param y y coordinate
+ * \param text UTF-8 string to plot
+ * \param length length of string, in bytes
+ * \param fstyle plot style for this text
+ * \return true on success, false on error and error reported
+ */
+ bool (*text)(int x, int y, const char *text, size_t length,
+ const plot_font_style_t *fstyle);
+
+ /* optional callbacks */
+ bool (*group_start)(const char *name); /**< optional, may be NULL */
+ bool (*group_end)(void); /**< optional, may be NULL */
+ bool (*flush)(void); /**< optional, may be NULL */
+
+ /* flags */
+ bool option_knockout; /**< set if knockout rendering is required */
+};
+
+
+/* Redraw context */
+struct redraw_context {
+ /** Redraw to show interactive features, such as active selections
+ * etc. Should be off for printing. */
+ bool interactive;
+
+ /** Render background images. May want it off for printing. */
+ bool background_images;
+
+ /** Current plotters, must be assigned before use. */
+ const struct plotter_table *plot;
+};
+
+#endif
diff --git a/render/form.c b/render/form.c
index b07acdb..af571ae 100644
--- a/render/form.c
+++ b/render/form.c
@@ -47,7 +47,7 @@
#include "netsurf/mouse.h"
#include "desktop/knockout.h"
#include "desktop/plot_style.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
#include "netsurf/misc.h"
diff --git a/render/html_redraw.c b/render/html_redraw.c
index 40783c3..01e7246 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -43,7 +43,7 @@
#include "content/content_protected.h"
#include "content/handlers/css/utils.h"
#include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/selection.h"
#include "desktop/print.h"
#include "desktop/scrollbar.h"
diff --git a/render/textplain.c b/render/textplain.c
index 2323f43..80828e7 100644
--- a/render/textplain.c
+++ b/render/textplain.c
@@ -42,7 +42,7 @@
#include "content/handlers/css/utils.h"
#include "netsurf/browser_window.h"
#include "utils/nsoption.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/search.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=7fc0a4c481d7adad14a...
commit 7fc0a4c481d7adad14a42740037d50b2f9e1cdc1
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
move desktop window header into public API
diff --git a/content/content.c b/content/content.c
index ad130a5..36e3e79 100644
--- a/content/content.c
+++ b/content/content.c
@@ -31,7 +31,7 @@
#include "desktop/plotters.h"
#include "desktop/knockout.h"
#include "desktop/gui_internal.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/bitmap.h"
#include "content/content_protected.h"
diff --git a/desktop/browser.c b/desktop/browser.c
index f69acc5..6b3746f 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -497,7 +497,7 @@ char * browser_window_get_selection(struct browser_window *bw)
return content_get_selection(bw->selection.bw->current_content);
}
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
bool browser_window_can_search(struct browser_window *bw)
{
if (bw == NULL || bw->current_content == NULL)
@@ -515,14 +515,14 @@ bool browser_window_can_search(struct browser_window *bw)
}
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
bool browser_window_is_frameset(struct browser_window *bw)
{
return (bw->children != NULL);
}
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
nserror browser_window_get_scrollbar_type(struct browser_window *bw,
browser_scrolling *h, browser_scrolling *v)
{
@@ -762,7 +762,7 @@ bool browser_window_drop_file_at_point(struct browser_window *bw,
return false;
}
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
void browser_window_set_gadget_filename(struct browser_window *bw,
struct form_control *gadget, const char *fn)
{
@@ -802,7 +802,7 @@ static bool slow_script(void *ctx)
return true;
}
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
nserror browser_window_create(enum browser_window_create_flags flags,
nsurl *url, nsurl *referrer,
struct browser_window *existing,
@@ -1872,7 +1872,7 @@ browser_window_refresh_url_bar_internal(struct browser_window *bw, nsurl *url)
}
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
void browser_window_destroy(struct browser_window *bw)
{
/* can't destoy child windows on their own */
@@ -1883,7 +1883,7 @@ void browser_window_destroy(struct browser_window *bw)
free(bw);
}
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
nserror browser_window_refresh_url_bar(struct browser_window *bw)
{
nserror ret;
@@ -1919,7 +1919,7 @@ nserror browser_window_refresh_url_bar(struct browser_window *bw)
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
nserror browser_window_navigate(struct browser_window *bw,
nsurl *url,
nsurl *referrer,
@@ -2343,7 +2343,7 @@ void browser_window_update(struct browser_window *bw, bool scroll_to_top)
}
}
-/* Exported interface, documented in desktop/browser.h */
+/* Exported interface, documented in netsurf/browser_window.h */
void browser_window_update_box(struct browser_window *bw, struct rect *rect)
{
int pos_x;
@@ -2370,7 +2370,7 @@ void browser_window_update_box(struct browser_window *bw, struct rect *rect)
}
}
-/* Exported interface, documented in desktop/browser.h */
+/* Exported interface, documented in netsurf/browser_window.h */
void browser_window_stop(struct browser_window *bw)
{
int children, index;
@@ -2411,7 +2411,7 @@ void browser_window_stop(struct browser_window *bw)
}
-/* Exported interface, documented in desktop/browser.h */
+/* Exported interface, documented in netsurf/browser_window.h */
void browser_window_reload(struct browser_window *bw, bool all)
{
hlcache_handle *c;
@@ -2457,7 +2457,7 @@ void browser_window_reload(struct browser_window *bw, bool all)
}
-/* Exported interface, documented in desktop/browser.h */
+/* Exported interface, documented in netsurf/browser_window.h */
void browser_window_set_status(struct browser_window *bw, const char *text)
{
int text_len;
@@ -2491,7 +2491,7 @@ void browser_window_set_status(struct browser_window *bw, const char *text)
}
-/* Exported interface, documented in desktop/browser.h */
+/* Exported interface, documented in netsurf/browser_window.h */
void browser_window_set_pointer(struct browser_window *bw,
browser_pointer_shape shape)
{
@@ -2530,7 +2530,7 @@ void browser_window_set_pointer(struct browser_window *bw,
guit->window->set_pointer(root->window, gui_shape);
}
-/* exported function documented in desktop/browser.h */
+/* exported function documented in netsurf/browser_window.h */
nserror browser_window_schedule_reformat(struct browser_window *bw)
{
/* The ugly cast here is so the reformat function can be
@@ -2541,7 +2541,7 @@ nserror browser_window_schedule_reformat(struct browser_window *bw)
}
-/* exported function documented in desktop/browser.h */
+/* exported function documented in netsurf/browser_window.h */
void browser_window_reformat(struct browser_window *bw, bool background,
int width, int height)
{
@@ -2601,7 +2601,7 @@ static void browser_window_set_scale_internal(struct browser_window *bw,
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
void browser_window_set_scale(struct browser_window *bw, float scale, bool all)
{
while (bw->parent && all)
@@ -2616,7 +2616,7 @@ void browser_window_set_scale(struct browser_window *bw, float scale, bool all)
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
float browser_window_get_scale(struct browser_window *bw)
{
if (bw == NULL) {
@@ -2681,7 +2681,7 @@ static void browser_window_find_target_internal(struct browser_window *bw,
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
struct browser_window *browser_window_find_target(struct browser_window *bw,
const char *target, browser_mouse_state mouse)
{
@@ -2875,7 +2875,7 @@ static void browser_window_mouse_drag_end(struct browser_window *bw,
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
void browser_window_mouse_track(struct browser_window *bw,
browser_mouse_state mouse, int x, int y)
{
@@ -3023,7 +3023,7 @@ void browser_window_mouse_track(struct browser_window *bw,
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
void browser_window_mouse_click(struct browser_window *bw,
browser_mouse_state mouse, int x, int y)
{
@@ -3148,7 +3148,7 @@ void browser_window_mouse_click(struct browser_window *bw,
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
void browser_window_redraw_rect(struct browser_window *bw, int x, int y,
int width, int height)
{
@@ -3156,7 +3156,7 @@ void browser_window_redraw_rect(struct browser_window *bw, int x, int y,
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
void browser_window_page_drag_start(struct browser_window *bw, int x, int y)
{
assert(bw != NULL);
@@ -3181,7 +3181,7 @@ void browser_window_page_drag_start(struct browser_window *bw, int x, int y)
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
bool browser_window_back_available(struct browser_window *bw)
{
return (bw && bw->history &&
@@ -3190,21 +3190,21 @@ bool browser_window_back_available(struct browser_window *bw)
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
bool browser_window_forward_available(struct browser_window *bw)
{
return (bw && bw->history &&
browser_window_history_forward_available(bw));
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
bool browser_window_reload_available(struct browser_window *bw)
{
return (bw && bw->current_content && !bw->loading_content);
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
bool browser_window_stop_available(struct browser_window *bw)
{
return (bw && (bw->loading_content ||
diff --git a/desktop/browser.h b/desktop/browser.h
deleted file mode 100644
index 35eab0e..0000000
--- a/desktop/browser.h
+++ /dev/null
@@ -1,715 +0,0 @@
-/*
- * Copyright 2003 Phil Mellor <monkeyson(a)users.sourceforge.net>
- * Copyright 2006 James Bursa <bursa(a)users.sourceforge.net>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-/** \file
- * Browser window creation and manipulation (interface).
- */
-
-#ifndef _NETSURF_DESKTOP_BROWSER_H_
-#define _NETSURF_DESKTOP_BROWSER_H_
-
-#include <stdbool.h>
-#include <stdio.h>
-
-#include "utils/errors.h"
-#include "desktop/plot_style.h"
-#include "desktop/frame_types.h"
-#include "netsurf/mouse.h"
-
-struct browser_window;
-struct hlcache_handle;
-struct gui_window;
-struct history;
-struct selection;
-struct fetch_multipart_data;
-struct form_control;
-struct nsurl;
-struct rect;
-struct redraw_context;
-enum content_debug;
-
-typedef enum {
- DRAGGING_NONE,
- DRAGGING_SELECTION,
- DRAGGING_PAGE_SCROLL,
- DRAGGING_FRAME,
- DRAGGING_SCR_X,
- DRAGGING_SCR_Y,
- DRAGGING_CONTENT_SCROLLBAR,
- DRAGGING_OTHER
-} browser_drag_type;
-
-typedef enum {
- BW_EDITOR_NONE = 0, /**< No selection, no editing */
- BW_EDITOR_CAN_COPY = (1 << 0), /**< Have selection */
- BW_EDITOR_CAN_CUT = (1 << 1), /**< Selection not read-only */
- BW_EDITOR_CAN_PASTE = (1 << 2) /**< Can paste, input */
-} browser_editor_flags;
-
-typedef enum {
- BW_SCROLLING_AUTO,
- BW_SCROLLING_YES,
- BW_SCROLLING_NO
-} browser_scrolling;
-
-/** flags to browser_window_create */
-enum browser_window_create_flags {
- /** No flags set */
- BW_CREATE_NONE = 0,
-
- /** this will form a new history node (don't set for back/reload/etc) */
- BW_CREATE_HISTORY = (1 << 0),
-
- /** New gui_window to be tab in same window as "existing" gui_window */
- BW_CREATE_TAB = (1 << 1),
-
- /** New gui_window to be clone of "existing" gui_window */
- BW_CREATE_CLONE = (1 << 2),
-
- /** Window not opened by user interaction (e.g. JS popup)
- *
- * rfc2965:
- * A transaction is verifiable if the user, or a
- * user-designated agent, has the option to review
- * the request-URI prior to its use in the transaction.
- * A transaction is unverifiable if the user does not
- * have that option.
- */
- BW_CREATE_UNVERIFIABLE = (1 << 3),
-};
-
-/** flags to browser_window_navigate */
-enum browser_window_nav_flags {
- /** No flags set */
- BW_NAVIGATE_NONE = 0,
-
- /** this will form a new history node (don't set for back/reload/etc) */
- BW_NAVIGATE_HISTORY = (1 << 0),
-
- /** download rather than render the uri */
- BW_NAVIGATE_DOWNLOAD = (1 << 1),
-
- /** Transation not caused by user interaction (e.g. JS-caused)
- *
- * rfc2965:
- * A transaction is verifiable if the user, or a
- * user-designated agent, has the option to review
- * the request-URI prior to its use in the transaction.
- * A transaction is unverifiable if the user does not
- * have that option.
- */
- BW_NAVIGATE_UNVERIFIABLE = (1 << 2)
-};
-
-/**
- * Page features at a specific spatial location.
- */
-struct browser_window_features {
- /** URL of a link or NULL. */
- struct nsurl *link;
-
- /** Object at position or NULL. */
- struct hlcache_handle *object;
-
- /** handle of top level content. */
- struct hlcache_handle *main;
-
- /** type of form feature. */
- enum {
- CTX_FORM_NONE,
- CTX_FORM_TEXT,
- CTX_FORM_FILE
- } form_features;
-};
-
-/**
- * Create and open a new root browser window with the given page.
- *
- * \param flags Flags to control operation
- * \param url URL to fetch in the new window or NULL for blank
- * \param referrer The referring uri or NULL if none
- * \param existing The an existing bw or NULL, required for some flags.
- * \param bw Updated to created browser window or untouched on error.
- * \return NSERROR_OK, or appropriate error otherwise.
- */
-nserror browser_window_create(enum browser_window_create_flags flags,
- struct nsurl *url, struct nsurl *referrer,
- struct browser_window *existing,
- struct browser_window **bw);
-
-/**
- * Start fetching a page in a browser window.
- *
- * \param bw browser window
- * \param url URL to start fetching
- * \param flags Flags to control operation
- * \param referrer The referring uri or NULL if none
- * \param post_urlenc url encoded post data or NULL if none
- * \param post_multipart multipart post data or NULL if none
- * \param parent Parent content or NULL if none
- *
- * Any existing fetches in the window are aborted.
- *
- * If post_urlenc and post_multipart are NULL the url is fetched using
- * GET rather than POST.
- *
- */
-nserror browser_window_navigate(struct browser_window *bw,
- struct nsurl *url,
- struct nsurl *referrer,
- enum browser_window_nav_flags flags,
- char *post_urlenc,
- struct fetch_multipart_data *post_multipart,
- struct hlcache_handle *parent);
-
-/**
- * Return true if a browser window can navigate upwards.
- *
- * \param bw the browser window to test.
- * \return true if navigation up is possible otherwise false.
- */
-bool browser_window_up_available(struct browser_window *bw);
-
-/**
- * Navigate to a browser_window's parent URL.
- *
- * \param bw browser window
- * \param new_window whether to open parent in a new window, or existing
- */
-nserror browser_window_navigate_up(struct browser_window *bw, bool new_window);
-
-/**
- * Get a browser window's URL.
- *
- * \param bw browser window
- * \return pointer to nsurl. Doesn't create a ref for caller.
- *
- * \note guaranteed to return a valid nsurl ptr, never returns NULL.
- */
-struct nsurl* browser_window_get_url(struct browser_window *bw);
-
-/**
- * Get the title of a browser_window.
- *
- * \param bw The browser window.
- */
-const char* browser_window_get_title(struct browser_window *bw);
-
-/**
- * Get a browser window's history object.
- *
- * \param bw browser window
- * \return pointer browser window's history object
- *
- * Clients need history object to make use of the history_* functions.
- */
-struct history * browser_window_get_history(struct browser_window *bw);
-
-/**
- * Get a browser window's content extents.
- *
- * \param bw browser window
- * \param scaled whether to apply current browser window scale
- * \param width updated to content width extent in px
- * \param height updated to content height extent in px
- * \return NSERROR_OK, or appropriate error otherwise.
- */
-nserror browser_window_get_extents(struct browser_window *bw, bool scaled,
- int *width, int *height);
-
-/**
- * Find out if a browser window is currently showing a content.
- *
- * \param bw browser window
- * \return true iff browser window is showing a content, else false.
- */
-bool browser_window_has_content(struct browser_window *bw);
-
-/**
- * Get a cache handle for the content within a browser window.
- */
-struct hlcache_handle *browser_window_get_content(struct browser_window *bw);
-
-/**
- * Set the dimensions of the area a browser window occupies
- *
- * \param bw The browser window to set dimensions of
- * \param width Width in pixels
- * \param height Height in pixels
- */
-void browser_window_set_dimensions(struct browser_window *bw,
- int width, int height);
-
-/**
- * Redraw browser window, set extent to content, and update title.
- *
- * \param bw browser_window
- * \param scroll_to_top move view to top of page
- */
-void browser_window_update(struct browser_window *bw, bool scroll_to_top);
-
-/**
- * update an area of a browser window.
- *
- * \param bw The browser window to update.
- * \param rect The area to redraw
- */
-void browser_window_update_box(struct browser_window *bw, struct rect *rect);
-
-/**
- * Stop all fetching activity in a browser window.
- *
- * \param bw The browser window to stop activity in.
- */
-void browser_window_stop(struct browser_window *bw);
-
-/**
- * Reload the page in a browser window.
- *
- * \param bw browser window
- * \param all whether to reload all objects associated with the page
- */
-void browser_window_reload(struct browser_window *bw, bool all);
-
-/**
- * Close and destroy a browser window.
- *
- * \param bw browser window
- */
-void browser_window_destroy(struct browser_window *bw);
-
-/**
- * Reformat a browser window contents to a new width or height.
- *
- * \param bw The browser window to reformat.
- * \param background Reformat in the background.
- * \param width new width
- * \param height new height
- */
-void browser_window_reformat(struct browser_window *bw, bool background,
- int width, int height);
-
-
-/**
- * Sets the scale of a browser window.
- *
- * \param bw The browser window to scale.
- * \param scale The new scale.
- * \param all Scale all windows in the tree (ie work up as well as down)
- */
-void browser_window_set_scale(struct browser_window *bw, float scale, bool all);
-
-
-/**
- * Gets the scale of a browser window
- *
- * \param bw The browser window to get the scale of.
- * \return The scale of the window.
- */
-float browser_window_get_scale(struct browser_window *bw);
-
-/**
- * Get access to any page features at the given coordinates.
- *
- * Fetches page features like content, link URLs and objects (images)
- * at the specified co-ordinates within the browsing context.
- *
- * Fields within the supplied features structure are updated with
- * pointers to any relevent content, or set to NULL if none.
- *
- * \param[in] bw browser window to examine.
- * \param[in] x x-coordinate of point of interest
- * \param[in] y y-coordinate of point of interest
- * \param[out] data Feature structure to update.
- * \return NSERROR_OK or appropriate error code on faliure.
- */
-nserror browser_window_get_features(struct browser_window *bw,
- int x, int y, struct browser_window_features *data);
-
-/**
- * Send a scroll request to a browser window at a particular point. The
- * 'deepest' scrollable object which can be scrolled in the requested
- * direction at the given point will consume the scroll.
- *
- * \param bw browser window to look inside
- * \param x x-coordinate of point of interest
- * \param y y-coordinate of point of interest
- * \param scrx number of px try to scroll something in x direction
- * \param scry number of px try to scroll something in y direction
- * \return true iff scroll request has been consumed
- */
-bool browser_window_scroll_at_point(struct browser_window *bw,
- int x, int y, int scrx, int scry);
-
-/**
- * Drop a file onto a browser window at a particular point, or determine if a
- * file may be dropped onto the content at given point.
- *
- * \param bw browser window to look inside
- * \param x x-coordinate of point of interest
- * \param y y-coordinate of point of interest
- * \param file path to file to be dropped, or NULL to know if drop allowed
- * \return true iff file drop has been handled, or if drop possible (NULL file)
- */
-bool browser_window_drop_file_at_point(struct browser_window *bw,
- int x, int y, char *file);
-
-/**
- * set filename on form control.
- *
- * \param bw browser window to look inside.
- * \param gadget form control.
- * \param fn filename to set.
- */
-void browser_window_set_gadget_filename(struct browser_window *bw,
- struct form_control *gadget, const char *fn);
-
-/**
- * Update URL bar for a given browser window to bw's content's URL
- *
- * \param bw Browser window to update URL bar for.
- */
-nserror browser_window_refresh_url_bar(struct browser_window *bw);
-
-/**
- * Handle mouse clicks in a browser window.
- *
- * \param bw browser window
- * \param mouse state of mouse buttons and modifier keys
- * \param x coordinate of mouse
- * \param y coordinate of mouse
- */
-void browser_window_mouse_click(struct browser_window *bw,
- browser_mouse_state mouse, int x, int y);
-
-/**
- * Handle non-click mouse action in a browser window. (drag ends, movements)
- *
- * \param bw browser window
- * \param mouse state of mouse buttons and modifier keys
- * \param x coordinate of mouse
- * \param y coordinate of mouse
- */
-void browser_window_mouse_track(struct browser_window *bw,
- browser_mouse_state mouse, int x, int y);
-
-/**
- * Locate a browser window in the specified stack according.
- *
- * \param bw the browser_window to search all relatives of
- * \param target the target to locate
- * \param mouse The current mouse state
- * \return The browser window the mouse is in
- */
-struct browser_window *browser_window_find_target(
- struct browser_window *bw, const char *target,
- browser_mouse_state mouse);
-
-/**
- * Cause the frontends reformat entry to be called in safe context.
- *
- * The browser_window_reformat call cannot safely be called from some
- * contexts, this call allows for the reformat to happen from a safe
- * top level context.
- *
- * The callback is frontend provided as the context information (size
- * etc.) about the windowing toolkit is only available to the
- * frontend.
- */
-nserror browser_window_schedule_reformat(struct browser_window *bw);
-
-
-
-void browser_select_menu_callback(void *client_data,
- int x, int y, int width, int height);
-
-/**
- * Redraw a rectangular region of a browser window.
- *
- * \param bw browser window to be redrawn
- * \param x x co-ord of top-left
- * \param y y co-ord of top-left
- * \param width width of rectangle
- * \param height height of rectangle
- */
-void browser_window_redraw_rect(struct browser_window *bw, int x, int y,
- int width, int height);
-
-/**
- * Change the shape of the mouse pointer
- *
- * \param bw Browser window to set shape in
- * \param shape The pointer shape to use
- */
-void browser_window_set_pointer(struct browser_window *bw,
- browser_pointer_shape shape);
-
-/**
- * Start drag scrolling the contents of the browser window
- *
- * \param bw browser window
- * \param x x ordinate of initial mouse position
- * \param y y ordinate
- */
-void browser_window_page_drag_start(struct browser_window *bw, int x, int y);
-
-/**
- * Check availability of Back action for a given browser window
- *
- * \param bw browser window
- * \return true if Back action is available
- */
-bool browser_window_back_available(struct browser_window *bw);
-
-/**
- * Check availability of Forward action for a given browser window
- *
- * \param bw browser window
- * \return true if Forward action is available
- */
-bool browser_window_forward_available(struct browser_window *bw);
-
-/**
- * Check availability of Reload action for a given browser window
- *
- * \param bw browser window
- * \return true if Reload action is available
- */
-bool browser_window_reload_available(struct browser_window *bw);
-
-/**
- * Check availability of Stop action for a given browser window
- *
- * \param bw browser window
- * \return true if Stop action is available
- */
-bool browser_window_stop_available(struct browser_window *bw);
-
-/**
- * Redraw an area of a window.
- *
- * Calls the redraw function for the content.
- *
- * \param bw The window to redraw
- * \param x coordinate for top-left of redraw
- * \param y coordinate for top-left of redraw
- * \param clip clip rectangle coordinates
- * \param ctx redraw context
- * \return true if successful, false otherwise
- *
- * The clip rectangle is guaranteed to be filled to its extents, so there is
- * no need to render a solid background first.
- *
- * x, y and clip are coordinates from the top left of the canvas area.
- *
- * The top left corner of the clip rectangle is (x0, y0) and
- * the bottom right corner of the clip rectangle is (x1, y1).
- * Units for x, y and clip are pixels.
- */
-bool browser_window_redraw(struct browser_window *bw, int x, int y,
- const struct rect *clip, const struct redraw_context *ctx);
-
-/**
- * Check whether browser window is ready for redraw
- *
- * \param bw The window to redraw
- * \return true if browser window is ready for redraw
- */
-bool browser_window_redraw_ready(struct browser_window *bw);
-
-/**
- * Get the position of the current browser window with respect to the root or
- * parent browser window
- *
- * \param bw browser window to get the position of
- * \param root true if we want position wrt root bw, false if wrt parent bw
- * \param pos_x updated to x position of bw
- * \param pos_y updated to y position of bw
- */
-void browser_window_get_position(struct browser_window *bw, bool root,
- int *pos_x, int *pos_y);
-
-/**
- * Set the position of the current browser window with respect to the parent
- * browser window
- *
- * \param bw browser window to set the position of
- * \param x x position of bw
- * \param y y position of bw
- */
-void browser_window_set_position(struct browser_window *bw, int x, int y);
-
-/**
- * Scroll the browser window to display the passed area
- *
- * \param bw browser window to scroll
- * \param rect area to display
- */
-void browser_window_scroll_visible(struct browser_window *bw,
- const struct rect *rect);
-
-/**
- * Set scroll offsets for a browser window.
- *
- * \param bw The browser window
- * \param x The x scroll offset to set
- * \param y The y scroll offset to set
- *
- * \todo Do we really need this and browser_window_scroll_visible?
- * Ditto for gui_window_* variants.
- */
-void browser_window_set_scroll(struct browser_window *bw, int x, int y);
-
-/**
- * Set drag type for a browser window, and inform front end
- *
- * \param bw browser window to set the type of the current drag for
- * \param type drag type
- * \param rect area pointer may be confined to, during drag, or NULL
- */
-void browser_window_set_drag_type(struct browser_window *bw,
- browser_drag_type type, const struct rect *rect);
-
-/**
- * Get type of any current drag for a browser window
- *
- * \param bw browser window to set the type of the current drag for
- * \return drag type
- */
-browser_drag_type browser_window_get_drag_type(struct browser_window *bw);
-
-/**
- * Check whether browser window can accept a cut/copy/paste, or has a selection
- * that could be saved.
- *
- * \param bw The browser window
- * \return flags indicating editor flags
- */
-browser_editor_flags browser_window_get_editor_flags(struct browser_window *bw);
-
-/**
- * Find out if given browser window content is selectable
- *
- * \param bw browser window to look at
- * \return true iff browser window is selectable
- */
-bool browser_window_can_select(struct browser_window *bw);
-
-/**
- * Get the current selection from a root browser window, ownership passed to
- * caller, who must free() it.
- *
- * \param bw The browser window
- * \return the selected text string, or NULL
- */
-char * browser_window_get_selection(struct browser_window *bw);
-
-/**
- * Find out if given browser window can be searched
- *
- * \param bw browser window to look at
- * \return true iff browser window is searchable
- */
-bool browser_window_can_search(struct browser_window *bw);
-
-/**
- * Find out if a browser window contains a frameset
- *
- * \param bw browser window to look at
- * \return true iff browser window contains a frameset
- */
-bool browser_window_is_frameset(struct browser_window *bw);
-
-/**
- * Get the browser window's scrollbar details.
- *
- * Vertical and horizontal scrollbars may be {YES|NO|AUTO}, although
- * it is entirely up to the front end whether this is implemented.
- * e.g. if the gui toolkit style-guide says all windows must have
- * scrollbars then this API can be ignored.
- *
- * \param bw browser window to look at
- * \param h Updated to indicate horizontal scrollbar type
- * \param v Updated to indicate vertical scrollbar type
- * \return NSERROR_OK, or appropriate error otherwise
- */
-nserror browser_window_get_scrollbar_type(struct browser_window *bw,
- browser_scrolling *h, browser_scrolling *v);
-
-/**
- * Set the DPI of the browser.
- *
- * \param dpi The DPI to set.
- */
-nserror browser_set_dpi(int dpi);
-
-/**
- * Get the browser DPI.
- *
- * \return The DPI in use.
- */
-int browser_get_dpi(void);
-
-/**
- * Dump debug info concerning the browser window's contents to file
- *
- * \param bw The browser window.
- * \param f The file to dump to.
- * \param op The debug operation type to dump.
- * \return NSERROR_OK on success or error code on faliure.
- */
-nserror browser_window_debug_dump(struct browser_window *bw, FILE *f, enum content_debug op);
-
-/**
- * Set debug options on a window
- *
- * \param bw The browser window.
- * \param op The debug operation type.
- * \return NSERROR_OK on success or error code on faliure.
- */
-nserror browser_window_debug(struct browser_window *bw, enum content_debug op);
-
-/**
- * Obtain a browsing contexts name.
- *
- * The returned pointer is owned bu the browsing context and is only
- * valid untill the next operation on that context.
- * The returned name may be NULL if no name has been set.
- * \todo This does not consider behaviour wrt frames
- *
- * \param bw The browser window.
- * \param name recives result string.
- * \return NSERROR_OK
- */
-nserror browser_window_get_name(struct browser_window *bw, const char **name);
-
-/**
- * Set a browsing contexts name.
- *
- * Changes a browsing contexts name to a copy of that passed and the
- * value is not subsequently referenced.
- *
- * \param bw The browser window.
- * \param name The name string to set.
- * \return NSERROR_OK and the name is updated or NSERROR_NOMEM and the
- * original name is untouched.
- */
-nserror browser_window_set_name(struct browser_window *bw, const char *name);
-
-#endif
diff --git a/desktop/browser_private.h b/desktop/browser_private.h
index efd875f..2641a0e 100644
--- a/desktop/browser_private.h
+++ b/desktop/browser_private.h
@@ -26,8 +26,8 @@
#include <libwapcaplet/libwapcaplet.h>
-#include "desktop/browser.h"
-
+#include "netsurf/browser_window.h"
+#include "desktop/frame_types.h"
struct box;
struct hlcache_handle;
diff --git a/desktop/frame_types.h b/desktop/frame_types.h
index 7008e98..416c888 100644
--- a/desktop/frame_types.h
+++ b/desktop/frame_types.h
@@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Browser window creation and manipulation (interface).
+/**
+ * \file
+ * Interface to browser frames.
*/
#ifndef _NETSURF_DESKTOP_FRAME_TYPES_H_
diff --git a/desktop/frames.h b/desktop/frames.h
index b39c8a8..063e2c5 100644
--- a/desktop/frames.h
+++ b/desktop/frames.h
@@ -24,6 +24,8 @@
#define _NETSURF_DESKTOP_FRAMES_H_
struct scrollbar_msg_data;
+struct content_html_iframe;
+struct content_html_frames;
/**
* Create and open iframes for a browser window.
diff --git a/desktop/global_history.c b/desktop/global_history.c
index 9fa1d6d..01b7dee 100644
--- a/desktop/global_history.c
+++ b/desktop/global_history.c
@@ -29,7 +29,7 @@
#include "desktop/global_history.h"
#include "desktop/treeview.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#define N_DAYS 28
#define N_SEC_PER_DAY (60 * 60 * 24)
diff --git a/desktop/hotlist.c b/desktop/hotlist.c
index f9a1f41..eae5ad8 100644
--- a/desktop/hotlist.c
+++ b/desktop/hotlist.c
@@ -37,7 +37,7 @@
#include "desktop/gui_internal.h"
#include "desktop/hotlist.h"
#include "desktop/treeview.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#define N_DAYS 28
#define N_SEC_PER_DAY (60 * 60 * 24)
diff --git a/desktop/mouse.c b/desktop/mouse.c
index ea627ac..6d22fd4 100644
--- a/desktop/mouse.c
+++ b/desktop/mouse.c
@@ -20,7 +20,7 @@
* Browser window creation and manipulation (implementation).
*/
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "utils/log.h"
/**
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index fd4cacf..1ca2ea9 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -44,7 +44,7 @@
#include "render/html.h"
#include "render/textplain.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/system_colour.h"
#include "desktop/searchweb.h"
#include "netsurf/misc.h"
diff --git a/desktop/scrollbar.c b/desktop/scrollbar.c
index 64b7671..740fd33 100644
--- a/desktop/scrollbar.c
+++ b/desktop/scrollbar.c
@@ -30,7 +30,7 @@
#include "utils/utils.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/system_colour.h"
#include "netsurf/mouse.h"
#include "desktop/scrollbar.h"
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 804c78c..8c9efe1 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -31,7 +31,7 @@
#include "utils/utils.h"
#include "content/handlers/css/utils.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/textarea.h"
#include "desktop/textinput.h"
diff --git a/desktop/textarea.h b/desktop/textarea.h
index 66d5cbc..74652f3 100644
--- a/desktop/textarea.h
+++ b/desktop/textarea.h
@@ -29,7 +29,11 @@
#include "utils/utils.h"
+#include "desktop/plot_style.h"
+#include "netsurf/mouse.h"
+
struct textarea;
+struct redraw_context;
/* Text area flags */
typedef enum {
diff --git a/desktop/tree.c b/desktop/tree.c
index 91fd0b9..d1af766 100644
--- a/desktop/tree.c
+++ b/desktop/tree.c
@@ -34,7 +34,7 @@
#include "content/hlcache.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/tree.h"
struct tree {
diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c
index 38274f1..8436fdc 100644
--- a/frontends/amiga/arexx.c
+++ b/frontends/amiga/arexx.c
@@ -34,7 +34,7 @@
#include "utils/nsoption.h"
#include "utils/nsurl.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/window.h"
#include "desktop/version.h"
diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c
index 2322f0e..2d86307 100644
--- a/frontends/amiga/clipboard.c
+++ b/frontends/amiga/clipboard.c
@@ -31,7 +31,7 @@
#include "utils/utf8.h"
#include "utils/nsurl.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "desktop/textinput.h"
#include "netsurf/window.h"
diff --git a/frontends/amiga/ctxmenu.c b/frontends/amiga/ctxmenu.c
index 5951a10..2b6691f 100644
--- a/frontends/amiga/ctxmenu.c
+++ b/frontends/amiga/ctxmenu.c
@@ -41,7 +41,7 @@
#include "utils/nsoption.h"
#include "utils/nsurl.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/browser_history.h"
#include "netsurf/mouse.h"
#include "desktop/searchweb.h"
diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c
index b1526b9..fb020ce 100644
--- a/frontends/amiga/download.c
+++ b/frontends/amiga/download.c
@@ -50,7 +50,7 @@
#include "utils/string.h"
#include "desktop/download.h"
#include "desktop/save_complete.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "netsurf/download.h"
diff --git a/frontends/amiga/drag.h b/frontends/amiga/drag.h
index b8ccec1..f8a1655 100644
--- a/frontends/amiga/drag.h
+++ b/frontends/amiga/drag.h
@@ -19,7 +19,7 @@
#ifndef AMIGA_DRAG_H
#define AMIGA_DRAG_H
#include <exec/types.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/window.h"
#define AMI_DRAG_THRESHOLD 10
diff --git a/frontends/amiga/file.c b/frontends/amiga/file.c
index 3b5d541..595a981 100644
--- a/frontends/amiga/file.c
+++ b/frontends/amiga/file.c
@@ -29,7 +29,7 @@
#include "content/hlcache.h"
#include "content/content.h"
#include "content/fetch.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/save_complete.h"
#include "desktop/save_pdf.h"
#include "desktop/save_text.h"
diff --git a/frontends/amiga/font.c b/frontends/amiga/font.c
index af62652..d3b9c32 100644
--- a/frontends/amiga/font.c
+++ b/frontends/amiga/font.c
@@ -24,7 +24,7 @@
#include "utils/log.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/layout.h"
#include "amiga/font.h"
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index ebc7f87..3ccb2eb 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -102,7 +102,7 @@
#include "content/urldb.h"
#include "content/handlers/image/ico.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/hotlist.h"
#include "netsurf/mouse.h"
#include "netsurf/netsurf.h"
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index f921b09..d700eaf 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -61,7 +61,7 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/searchweb.h"
#include "netsurf/window.h"
diff --git a/frontends/amiga/history_local.c b/frontends/amiga/history_local.c
index 3be097f..a1ada5b 100755
--- a/frontends/amiga/history_local.c
+++ b/frontends/amiga/history_local.c
@@ -45,7 +45,7 @@
#include "utils/utils.h"
#include "utils/messages.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "netsurf/window.h"
#include "graphics/rpattr.h"
diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c
index 0743bc7..4fa5ba1 100644
--- a/frontends/amiga/menu.c
+++ b/frontends/amiga/menu.c
@@ -49,7 +49,7 @@
#include "utils/nsurl.h"
#include "content/hlcache.h"
#include "desktop/hotlist.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "desktop/textinput.h"
diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c
index 86a27cf..aaf54b0 100755
--- a/frontends/amiga/search.c
+++ b/frontends/amiga/search.c
@@ -48,7 +48,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/content.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/search.h"
#include "netsurf/mouse.h"
#include "netsurf/window.h"
diff --git a/frontends/amiga/tree.c b/frontends/amiga/tree.c
index 05c2fa7..52d5899 100644
--- a/frontends/amiga/tree.c
+++ b/frontends/amiga/tree.c
@@ -55,7 +55,7 @@
#include "utils/messages.h"
#include "content/urldb.h"
#include "content/llcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/cookie_manager.h"
#include "desktop/global_history.h"
#include "desktop/hotlist.h"
diff --git a/frontends/atari/about.c b/frontends/atari/about.c
index 105037a..c541b0f 100644
--- a/frontends/atari/about.c
+++ b/frontends/atari/about.c
@@ -28,7 +28,7 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "desktop/version.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "curl/curlver.h"
diff --git a/frontends/atari/ctxmenu.c b/frontends/atari/ctxmenu.c
index 0343b20..e742035 100644
--- a/frontends/atari/ctxmenu.c
+++ b/frontends/atari/ctxmenu.c
@@ -19,7 +19,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/textinput.h"
#include "content/hlcache.h"
diff --git a/frontends/atari/deskmenu.c b/frontends/atari/deskmenu.c
index 7238358..2bb65cf 100644
--- a/frontends/atari/deskmenu.c
+++ b/frontends/atari/deskmenu.c
@@ -23,7 +23,7 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/save_complete.h"
#include "desktop/textinput.h"
diff --git a/frontends/atari/download.c b/frontends/atari/download.c
index c763ed2..ebe3cc4 100644
--- a/frontends/atari/download.c
+++ b/frontends/atari/download.c
@@ -35,7 +35,7 @@
#include "desktop/save_complete.h"
#include "desktop/textinput.h"
#include "desktop/download.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/download.h"
#include "atari/gui.h"
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 0e349ab..24caa7c 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -34,7 +34,7 @@
#include "content/backing_store.h"
#include "content/hlcache.h"
#include "desktop/treeview.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/layout.h"
#include "netsurf/window.h"
#include "netsurf/clipboard.h"
diff --git a/frontends/atari/rootwin.c b/frontends/atari/rootwin.c
index ca25a07..5a5bdcc 100644
--- a/frontends/atari/rootwin.c
+++ b/frontends/atari/rootwin.c
@@ -37,7 +37,7 @@
#include <mt_gem.h>
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/plotters.h"
#include "desktop/textinput.h"
diff --git a/frontends/atari/search.c b/frontends/atari/search.c
index 11fd67e..4da7f16 100644
--- a/frontends/atari/search.c
+++ b/frontends/atari/search.c
@@ -27,7 +27,7 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/search.h"
#include "netsurf/search.h"
diff --git a/frontends/atari/toolbar.c b/frontends/atari/toolbar.c
index d2182c5..2a50538 100644
--- a/frontends/atari/toolbar.c
+++ b/frontends/atari/toolbar.c
@@ -32,7 +32,7 @@
#include "utils/nsurl.h"
#include "utils/utf8.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/plot_style.h"
#include "desktop/plotters.h"
diff --git a/frontends/beos/bitmap.cpp b/frontends/beos/bitmap.cpp
index c9c786a..3287fd0 100644
--- a/frontends/beos/bitmap.cpp
+++ b/frontends/beos/bitmap.cpp
@@ -41,7 +41,7 @@ extern "C" {
#include "content/content.h"
#include "content/urldb.h"
#include "desktop/plotters.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/bitmap.h"
}
diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp
index 58b9f9b..c52fa81 100644
--- a/frontends/beos/gui.cpp
+++ b/frontends/beos/gui.cpp
@@ -62,7 +62,7 @@ extern "C" {
#include "content/fetchers/resource.h"
#include "content/hlcache.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/misc.h"
#include "netsurf/clipboard.h"
#include "netsurf/search.h"
diff --git a/frontends/beos/login.cpp b/frontends/beos/login.cpp
index de2370d..ad09d86 100644
--- a/frontends/beos/login.cpp
+++ b/frontends/beos/login.cpp
@@ -30,7 +30,7 @@ extern "C" {
#include "utils/log.h"
#include "content/content.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "utils/messages.h"
#include "utils/url.h"
#include "utils/utils.h"
diff --git a/frontends/beos/scaffolding.cpp b/frontends/beos/scaffolding.cpp
index 82ae2af..75ef241 100644
--- a/frontends/beos/scaffolding.cpp
+++ b/frontends/beos/scaffolding.cpp
@@ -54,7 +54,7 @@
extern "C" {
#include "content/content.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/netsurf.h"
#include "desktop/version.h"
#include "desktop/searchweb.h"
diff --git a/frontends/beos/schedule.cpp b/frontends/beos/schedule.cpp
index a9da535..171d745 100644
--- a/frontends/beos/schedule.cpp
+++ b/frontends/beos/schedule.cpp
@@ -26,7 +26,7 @@ extern "C" {
#include "utils/errors.h"
#include "beos/schedule.h"
#include "content/content.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#ifdef DEBUG_BEOS_SCHEDULE
#include "utils/log.h"
diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp
index 5e75a02..4fd6823 100644
--- a/frontends/beos/window.cpp
+++ b/frontends/beos/window.cpp
@@ -29,7 +29,7 @@ extern "C" {
#include "utils/utils.h"
#include "content/content.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/textinput.h"
#include "desktop/plotters.h"
diff --git a/frontends/cocoa/BookmarksController.m b/frontends/cocoa/BookmarksController.m
index 0bd51b2..e11cb3f 100644
--- a/frontends/cocoa/BookmarksController.m
+++ b/frontends/cocoa/BookmarksController.m
@@ -18,7 +18,7 @@
#import "utils/messages.h"
#import "utils/utils.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/hotlist.h"
#import "desktop/tree.h"
#import "content/hlcache.h"
diff --git a/frontends/cocoa/BrowserView.m b/frontends/cocoa/BrowserView.m
index fc50dbc..5d82c85 100644
--- a/frontends/cocoa/BrowserView.m
+++ b/frontends/cocoa/BrowserView.m
@@ -18,7 +18,7 @@
#import "utils/nsoption.h"
#import "utils/messages.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/plotters.h"
#import "desktop/textinput.h"
#import "content/hlcache.h"
diff --git a/frontends/cocoa/BrowserViewController.m b/frontends/cocoa/BrowserViewController.m
index 5fa8b64..3540151 100644
--- a/frontends/cocoa/BrowserViewController.m
+++ b/frontends/cocoa/BrowserViewController.m
@@ -23,7 +23,7 @@
#import "utils/messages.h"
#import "utils/url.h"
#import "desktop/browser_history.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/textinput.h"
#import "content/hlcache.h"
diff --git a/frontends/cocoa/BrowserWindowController.m b/frontends/cocoa/BrowserWindowController.m
index bfb8be0..aa7375a 100644
--- a/frontends/cocoa/BrowserWindowController.m
+++ b/frontends/cocoa/BrowserWindowController.m
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "utils/nsoption.h"
#import "utils/messages.h"
#import "utils/utils.h"
diff --git a/frontends/cocoa/FormSelectMenu.m b/frontends/cocoa/FormSelectMenu.m
index 84e04cd..b0ea0e6 100644
--- a/frontends/cocoa/FormSelectMenu.m
+++ b/frontends/cocoa/FormSelectMenu.m
@@ -19,7 +19,7 @@
#import "cocoa/FormSelectMenu.h"
#import "cocoa/coordinates.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "render/form.h"
static inline NSRect cocoa_rect_for_control( struct browser_window *bw, struct form_control *control)
diff --git a/frontends/cocoa/NetSurfAppDelegate.m b/frontends/cocoa/NetSurfAppDelegate.m
index f428563..0939a11 100644
--- a/frontends/cocoa/NetSurfAppDelegate.m
+++ b/frontends/cocoa/NetSurfAppDelegate.m
@@ -20,7 +20,7 @@
#import "utils/messages.h"
#import "utils/utils.h"
#import "utils/nsurl.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "cocoa/gui.h"
#import "cocoa/NetSurfAppDelegate.h"
diff --git a/frontends/cocoa/PreferencesWindowController.m b/frontends/cocoa/PreferencesWindowController.m
index f314736..7522186 100644
--- a/frontends/cocoa/PreferencesWindowController.m
+++ b/frontends/cocoa/PreferencesWindowController.m
@@ -17,7 +17,7 @@
*/
#import "utils/nsoption.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "content/content.h"
#import "content/hlcache.h"
diff --git a/frontends/cocoa/SearchWindowController.m b/frontends/cocoa/SearchWindowController.m
index d07fd04..95372fc 100644
--- a/frontends/cocoa/SearchWindowController.m
+++ b/frontends/cocoa/SearchWindowController.m
@@ -21,7 +21,7 @@
#import "cocoa/BrowserViewController.h"
#import "netsurf/search.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/search.h"
static void cocoa_search_set_back( bool active, void *p );
diff --git a/frontends/cocoa/bitmap.m b/frontends/cocoa/bitmap.m
index 14394d0..f7c28f0 100644
--- a/frontends/cocoa/bitmap.m
+++ b/frontends/cocoa/bitmap.m
@@ -23,7 +23,7 @@
#import <Cocoa/Cocoa.h>
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/plotters.h"
#import "netsurf/bitmap.h"
#import "content/urldb.h"
diff --git a/frontends/cocoa/coordinates.h b/frontends/cocoa/coordinates.h
index a43db0b..4bd9222 100644
--- a/frontends/cocoa/coordinates.h
+++ b/frontends/cocoa/coordinates.h
@@ -20,7 +20,7 @@
#define COCOA_COORDINATES_H
#include "utils/utils.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
extern CGFloat cocoa_scale_factor;
diff --git a/frontends/cocoa/gui.m b/frontends/cocoa/gui.m
index 7f39459..310e196 100644
--- a/frontends/cocoa/gui.m
+++ b/frontends/cocoa/gui.m
@@ -24,7 +24,7 @@
#import "netsurf/mouse.h"
#import "netsurf/window.h"
#import "netsurf/misc.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/textinput.h"
#import "content/handlers/image/ico.h"
#import "content/fetchers/resource.h"
diff --git a/frontends/cocoa/plotter.m b/frontends/cocoa/plotter.m
index dbc9460..472857d 100644
--- a/frontends/cocoa/plotter.m
+++ b/frontends/cocoa/plotter.m
@@ -20,7 +20,7 @@
#import "utils/log.h"
#import "utils/utils.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/plotters.h"
#import "desktop/plot_style.h"
diff --git a/frontends/framebuffer/clipboard.c b/frontends/framebuffer/clipboard.c
index 1d41622..1254c36 100644
--- a/frontends/framebuffer/clipboard.c
+++ b/frontends/framebuffer/clipboard.c
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/clipboard.h"
#include "framebuffer/gui.h"
diff --git a/frontends/framebuffer/fbtk/bitmap.c b/frontends/framebuffer/fbtk/bitmap.c
index 1f147be..759b626 100644
--- a/frontends/framebuffer/fbtk/bitmap.c
+++ b/frontends/framebuffer/fbtk/bitmap.c
@@ -24,7 +24,7 @@
#include <libnsfb.h>
#include <libnsfb_plot.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fbtk/event.c b/frontends/framebuffer/fbtk/event.c
index c089492..dab0355 100644
--- a/frontends/framebuffer/fbtk/event.c
+++ b/frontends/framebuffer/fbtk/event.c
@@ -31,7 +31,7 @@
#include "utils/utils.h"
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/textinput.h"
#include "framebuffer/gui.h"
diff --git a/frontends/framebuffer/fbtk/fbtk.c b/frontends/framebuffer/fbtk/fbtk.c
index db1c1f1..fa861b1 100644
--- a/frontends/framebuffer/fbtk/fbtk.c
+++ b/frontends/framebuffer/fbtk/fbtk.c
@@ -34,7 +34,7 @@
#include "utils/utils.h"
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "framebuffer/gui.h"
diff --git a/frontends/framebuffer/fbtk/fill.c b/frontends/framebuffer/fbtk/fill.c
index 07397b2..9377933 100644
--- a/frontends/framebuffer/fbtk/fill.c
+++ b/frontends/framebuffer/fbtk/fill.c
@@ -24,7 +24,7 @@
#include <libnsfb.h>
#include <libnsfb_plot.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fbtk/osk.c b/frontends/framebuffer/fbtk/osk.c
index 1d57f15..628fe9a 100644
--- a/frontends/framebuffer/fbtk/osk.c
+++ b/frontends/framebuffer/fbtk/osk.c
@@ -27,7 +27,7 @@
#include <libnsfb_cursor.h>
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fbtk/scroll.c b/frontends/framebuffer/fbtk/scroll.c
index c86c8a6..cc98fb2 100644
--- a/frontends/framebuffer/fbtk/scroll.c
+++ b/frontends/framebuffer/fbtk/scroll.c
@@ -28,7 +28,7 @@
#include <libnsfb_cursor.h>
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fbtk/text.c b/frontends/framebuffer/fbtk/text.c
index 258e9df..703a10b 100644
--- a/frontends/framebuffer/fbtk/text.c
+++ b/frontends/framebuffer/fbtk/text.c
@@ -28,7 +28,7 @@
#include <libnsfb_event.h>
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "framebuffer/gui.h"
diff --git a/frontends/framebuffer/fbtk/window.c b/frontends/framebuffer/fbtk/window.c
index 787dac7..b385e8e 100644
--- a/frontends/framebuffer/fbtk/window.c
+++ b/frontends/framebuffer/fbtk/window.c
@@ -24,7 +24,7 @@
#include <libnsfb.h>
#include <libnsfb_plot.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c
index bf96cab..9235ad4 100644
--- a/frontends/framebuffer/font_freetype.c
+++ b/frontends/framebuffer/font_freetype.c
@@ -29,7 +29,7 @@
#include "utils/nsoption.h"
#include "netsurf/utf8.h"
#include "netsurf/layout.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/font.h"
diff --git a/frontends/framebuffer/framebuffer.c b/frontends/framebuffer/framebuffer.c
index 16e9dd7..00bd6a1 100644
--- a/frontends/framebuffer/framebuffer.c
+++ b/frontends/framebuffer/framebuffer.c
@@ -31,7 +31,7 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/utf8.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "netsurf/bitmap.h"
diff --git a/frontends/framebuffer/gui.c b/frontends/framebuffer/gui.c
index 6313481..7559648 100644
--- a/frontends/framebuffer/gui.c
+++ b/frontends/framebuffer/gui.c
@@ -34,7 +34,7 @@
#include "utils/filepath.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/textinput.h"
#include "desktop/browser_history.h"
#include "desktop/plotters.h"
diff --git a/frontends/gtk/about.c b/frontends/gtk/about.c
index d57afea..f003faf 100644
--- a/frontends/gtk/about.c
+++ b/frontends/gtk/about.c
@@ -28,7 +28,7 @@
#include "utils/messages.h"
#include "utils/nsoption.h"
#include "utils/nsurl.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/version.h"
#include "gtk/warn.h"
diff --git a/frontends/gtk/completion.c b/frontends/gtk/completion.c
index 8444c83..9b76411 100644
--- a/frontends/gtk/completion.c
+++ b/frontends/gtk/completion.c
@@ -28,7 +28,7 @@
#include "utils/nsoption.h"
#include "content/urldb.h"
#include "desktop/searchweb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "gtk/warn.h"
#include "gtk/scaffolding.h"
diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index 1201424..27b73b1 100644
--- a/frontends/gtk/gui.c
+++ b/frontends/gtk/gui.c
@@ -42,7 +42,7 @@
#include "content/hlcache.h"
#include "content/urldb.h"
#include "content/backing_store.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/save_complete.h"
#include "desktop/save_pdf.h"
#include "desktop/searchweb.h"
diff --git a/frontends/gtk/preferences.c b/frontends/gtk/preferences.c
index 3efb9ed..e51e770 100644
--- a/frontends/gtk/preferences.c
+++ b/frontends/gtk/preferences.c
@@ -26,7 +26,7 @@
#include "utils/file.h"
#include "utils/log.h"
#include "utils/nsurl.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/searchweb.h"
#include "gtk/compat.h"
diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
index 7772567..6873b89 100644
--- a/frontends/gtk/scaffolding.c
+++ b/frontends/gtk/scaffolding.c
@@ -34,7 +34,7 @@
#include "utils/nsoption.h"
#include "utils/file.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/hotlist.h"
#include "desktop/plotters.h"
#include "desktop/print.h"
diff --git a/frontends/gtk/search.c b/frontends/gtk/search.c
index 1124c68..2c73814 100644
--- a/frontends/gtk/search.c
+++ b/frontends/gtk/search.c
@@ -30,7 +30,7 @@
#include "utils/messages.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/search.h"
#include "desktop/searchweb.h"
#include "netsurf/search.h"
diff --git a/frontends/gtk/selection.c b/frontends/gtk/selection.c
index ae44e78..228d65d 100644
--- a/frontends/gtk/selection.c
+++ b/frontends/gtk/selection.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/clipboard.h"
#include "gtk/window.h"
diff --git a/frontends/gtk/tabs.c b/frontends/gtk/tabs.c
index e8be7ee..56a1ed6 100644
--- a/frontends/gtk/tabs.c
+++ b/frontends/gtk/tabs.c
@@ -21,7 +21,7 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "content/content.h"
#include "desktop/search.h"
diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c
index b7bf07f..6866f00 100644
--- a/frontends/gtk/toolbar.c
+++ b/frontends/gtk/toolbar.c
@@ -21,7 +21,7 @@
#include <unistd.h>
#include <gtk/gtk.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/searchweb.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/frontends/gtk/viewdata.c b/frontends/gtk/viewdata.c
index 55b2546..90a2366 100644
--- a/frontends/gtk/viewdata.c
+++ b/frontends/gtk/viewdata.c
@@ -41,7 +41,7 @@
#include "utils/file.h"
#include "utils/filepath.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "content/hlcache.h"
#include "content/content.h"
diff --git a/frontends/gtk/viewsource.c b/frontends/gtk/viewsource.c
index 554cfbf..b0907a3 100644
--- a/frontends/gtk/viewsource.c
+++ b/frontends/gtk/viewsource.c
@@ -23,7 +23,7 @@
#include "utils/utf8.h"
#include "utils/nsurl.h"
#include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "content/content.h"
#include "gtk/viewdata.h"
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index 5c5d682..7cff9ee 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -39,7 +39,7 @@
#include "content/hlcache.h"
#include "gtk/window.h"
#include "gtk/selection.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
diff --git a/frontends/monkey/browser.c b/frontends/monkey/browser.c
index 638dcdb..5c1d157 100644
--- a/frontends/monkey/browser.c
+++ b/frontends/monkey/browser.c
@@ -27,7 +27,7 @@
#include "utils/messages.h"
#include "netsurf/mouse.h"
#include "netsurf/window.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "content/hlcache.h"
diff --git a/frontends/riscos/401login.c b/frontends/riscos/401login.c
index e95a748..476d631 100644
--- a/frontends/riscos/401login.c
+++ b/frontends/riscos/401login.c
@@ -28,7 +28,6 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
#include "riscos/gui.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/dialog.c b/frontends/riscos/dialog.c
index d435608..2b258bb 100644
--- a/frontends/riscos/dialog.c
+++ b/frontends/riscos/dialog.c
@@ -39,7 +39,7 @@
#include "utils/messages.h"
#include "utils/nsurl.h"
#include "desktop/version.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/configure.h"
#include "riscos/cookies.h"
diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c
index 531b816..e0e8e4e 100644
--- a/frontends/riscos/gui.c
+++ b/frontends/riscos/gui.c
@@ -52,7 +52,7 @@
#include "desktop/save_complete.h"
#include "desktop/treeview.h"
#include "netsurf/netsurf.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "content/urldb.h"
#include "content/hlcache.h"
#include "content/backing_store.h"
diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c
index 0530147..37c4de1 100644
--- a/frontends/riscos/gui/url_bar.c
+++ b/frontends/riscos/gui/url_bar.c
@@ -37,7 +37,7 @@
#include "utils/utils.h"
#include "content/hlcache.h"
#include "content/content.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/iconbar.c b/frontends/riscos/iconbar.c
index 9cff116..8582a45 100644
--- a/frontends/riscos/iconbar.c
+++ b/frontends/riscos/iconbar.c
@@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Iconbar icon and menus (implementation).
+/**
+ * \file
+ * Iconbar icon and menus implementation.
*/
#include <assert.h>
@@ -36,7 +37,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/nsurl.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/gui.h"
#include "riscos/configure.h"
diff --git a/frontends/riscos/menus.c b/frontends/riscos/menus.c
index 37285c9..0b1ac1a 100644
--- a/frontends/riscos/menus.c
+++ b/frontends/riscos/menus.c
@@ -40,7 +40,6 @@
#include "content/hlcache.h"
#include "content/urldb.h"
#include "desktop/cookie_manager.h"
-#include "desktop/browser.h"
#include "desktop/textinput.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/print.c b/frontends/riscos/print.c
index 95730d6..26b50f6 100644
--- a/frontends/riscos/print.c
+++ b/frontends/riscos/print.c
@@ -38,7 +38,7 @@
#include "utils/nsoption.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/save.c b/frontends/riscos/save.c
index 6eab315..325dbbb 100644
--- a/frontends/riscos/save.c
+++ b/frontends/riscos/save.c
@@ -42,7 +42,7 @@
#include "utils/utf8.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/hotlist.h"
#include "desktop/global_history.h"
#include "desktop/version.h"
diff --git a/frontends/riscos/search.c b/frontends/riscos/search.c
index 2e869bb..544630e 100644
--- a/frontends/riscos/search.c
+++ b/frontends/riscos/search.c
@@ -33,9 +33,8 @@
#include "utils/messages.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/search.h"
-#include "desktop/browser.h"
#include "desktop/search.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/sslcert.c b/frontends/riscos/sslcert.c
index 9e43f2d..7ab909d 100644
--- a/frontends/riscos/sslcert.c
+++ b/frontends/riscos/sslcert.c
@@ -34,7 +34,6 @@
#include "content/hlcache.h"
#include "content/fetch.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
#include "desktop/sslcert_viewer.h"
#include "desktop/tree.h"
diff --git a/frontends/riscos/textarea.c b/frontends/riscos/textarea.c
index ecf3e0c..d987292 100644
--- a/frontends/riscos/textarea.c
+++ b/frontends/riscos/textarea.c
@@ -33,7 +33,6 @@
#include "utils/log.h"
#include "utils/utf8.h"
-#include "desktop/browser.h"
#include "riscos/gui.h"
#include "riscos/oslib_pre7.h"
diff --git a/frontends/riscos/textselection.c b/frontends/riscos/textselection.c
index 81ccc3a..8127448 100644
--- a/frontends/riscos/textselection.c
+++ b/frontends/riscos/textselection.c
@@ -16,9 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Text selection code (platform-dependent implementation)
- */
+/**
+ * \file
+ * RISC OS text selection implementation.
+ */
#include <assert.h>
#include <stdio.h>
@@ -34,7 +35,7 @@
#include "netsurf/clipboard.h"
#include "netsurf/window.h"
#include "desktop/textinput.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/gui.h"
#include "riscos/menus.h"
diff --git a/frontends/riscos/theme_install.c b/frontends/riscos/theme_install.c
index 5c11ffb..3448e74 100644
--- a/frontends/riscos/theme_install.c
+++ b/frontends/riscos/theme_install.c
@@ -30,7 +30,6 @@
#include "utils/messages.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
#include "desktop/theme.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/treeview.c b/frontends/riscos/treeview.c
index 3428ad3..83f6066 100644
--- a/frontends/riscos/treeview.c
+++ b/frontends/riscos/treeview.c
@@ -40,7 +40,6 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
#include "desktop/plotters.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
diff --git a/frontends/riscos/uri.c b/frontends/riscos/uri.c
index 9c384c9..a2f126b 100644
--- a/frontends/riscos/uri.c
+++ b/frontends/riscos/uri.c
@@ -16,6 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/**
+ * \file
+ * RISC OS URI message handling implementation.
+ */
+
#include "utils/config.h"
#include <stdbool.h>
@@ -29,7 +34,7 @@
#include "utils/messages.h"
#include "utils/nsurl.h"
#include "content/fetch.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/gui.h"
#include "riscos/uri.h"
diff --git a/frontends/riscos/url_complete.c b/frontends/riscos/url_complete.c
index 3cf7f92..eebb764 100644
--- a/frontends/riscos/url_complete.c
+++ b/frontends/riscos/url_complete.c
@@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * GUI URL auto-completion (implementation).
+/**
+ * \file
+ * GUI URL auto-completion implementation.
*/
#include <assert.h>
@@ -30,7 +31,7 @@
#include "utils/log.h"
#include "utils/nsoption.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/global_history.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/url_protocol.c b/frontends/riscos/url_protocol.c
index 2b9ef35..9a7ae06 100644
--- a/frontends/riscos/url_protocol.c
+++ b/frontends/riscos/url_protocol.c
@@ -18,8 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * ANT URL launching protocol (implementation).
+/**
+ * \file
+ * ANT URL launching protocol implementation.
*
* See http://www.vigay.com/inet/inet_url.html
*/
@@ -38,7 +39,7 @@
#include "utils/nsurl.h"
#include "utils/config.h"
#include "content/fetch.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/gui.h"
#include "riscos/uri.h"
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index 2e012da..1fc6edf 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -56,7 +56,7 @@
#include "content/hlcache.h"
#include "content/urldb.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/cookie_manager.h"
#include "desktop/scrollbar.h"
#include "desktop/frames.h"
diff --git a/frontends/windows/drawable.c b/frontends/windows/drawable.c
index 4480eea..9c26d8e 100644
--- a/frontends/windows/drawable.c
+++ b/frontends/windows/drawable.c
@@ -23,7 +23,7 @@
#include <windows.h>
#include <windowsx.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/textinput.h"
#include "desktop/plotters.h"
#include "utils/errors.h"
diff --git a/frontends/windows/file.c b/frontends/windows/file.c
index e9eb9ca..5c5b1f0 100644
--- a/frontends/windows/file.c
+++ b/frontends/windows/file.c
@@ -35,7 +35,7 @@
#include "utils/url.h"
#include "utils/file.h"
#include "utils/string.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "windows/file.h"
diff --git a/frontends/windows/gui.c b/frontends/windows/gui.c
index cb75cdf..0ab1e32 100644
--- a/frontends/windows/gui.c
+++ b/frontends/windows/gui.c
@@ -31,7 +31,7 @@
#include "utils/url.h"
#include "utils/file.h"
#include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/clipboard.h"
#include "windows/schedule.h"
diff --git a/frontends/windows/main.c b/frontends/windows/main.c
index c410de9..49aa431 100644
--- a/frontends/windows/main.c
+++ b/frontends/windows/main.c
@@ -30,7 +30,7 @@
#include "utils/file.h"
#include "utils/nsurl.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/fetch.h"
#include "netsurf/misc.h"
#include "netsurf/netsurf.h"
diff --git a/frontends/windows/pointers.c b/frontends/windows/pointers.c
index abb4fe7..b796a30 100644
--- a/frontends/windows/pointers.c
+++ b/frontends/windows/pointers.c
@@ -29,7 +29,7 @@
#include "utils/corestrings.h"
#include "utils/url.h"
#include "utils/file.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/clipboard.h"
#include "windows/schedule.h"
diff --git a/frontends/windows/window.c b/frontends/windows/window.c
index afc741f..bbe0e96 100644
--- a/frontends/windows/window.c
+++ b/frontends/windows/window.c
@@ -30,7 +30,7 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "content/content.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/window.h"
#include "desktop/browser_history.h"
#include "desktop/textinput.h"
diff --git a/include/netsurf/browser_window.h b/include/netsurf/browser_window.h
new file mode 100644
index 0000000..36ed65a
--- /dev/null
+++ b/include/netsurf/browser_window.h
@@ -0,0 +1,714 @@
+/*
+ * Copyright 2003 Phil Mellor <monkeyson(a)users.sourceforge.net>
+ * Copyright 2006 James Bursa <bursa(a)users.sourceforge.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+/**
+ * \file
+ * Browser window creation and manipulation interface.
+ */
+
+#ifndef _NETSURF_DESKTOP_BROWSER_H_
+#define _NETSURF_DESKTOP_BROWSER_H_
+
+#include <stdbool.h>
+#include <stdio.h>
+
+#include "utils/errors.h"
+#include "netsurf/mouse.h"
+
+struct browser_window;
+struct hlcache_handle;
+struct gui_window;
+struct history;
+struct selection;
+struct fetch_multipart_data;
+struct form_control;
+struct nsurl;
+struct rect;
+struct redraw_context;
+enum content_debug;
+
+typedef enum {
+ DRAGGING_NONE,
+ DRAGGING_SELECTION,
+ DRAGGING_PAGE_SCROLL,
+ DRAGGING_FRAME,
+ DRAGGING_SCR_X,
+ DRAGGING_SCR_Y,
+ DRAGGING_CONTENT_SCROLLBAR,
+ DRAGGING_OTHER
+} browser_drag_type;
+
+typedef enum {
+ BW_EDITOR_NONE = 0, /**< No selection, no editing */
+ BW_EDITOR_CAN_COPY = (1 << 0), /**< Have selection */
+ BW_EDITOR_CAN_CUT = (1 << 1), /**< Selection not read-only */
+ BW_EDITOR_CAN_PASTE = (1 << 2) /**< Can paste, input */
+} browser_editor_flags;
+
+typedef enum {
+ BW_SCROLLING_AUTO,
+ BW_SCROLLING_YES,
+ BW_SCROLLING_NO
+} browser_scrolling;
+
+/** flags to browser_window_create */
+enum browser_window_create_flags {
+ /** No flags set */
+ BW_CREATE_NONE = 0,
+
+ /** this will form a new history node (don't set for back/reload/etc) */
+ BW_CREATE_HISTORY = (1 << 0),
+
+ /** New gui_window to be tab in same window as "existing" gui_window */
+ BW_CREATE_TAB = (1 << 1),
+
+ /** New gui_window to be clone of "existing" gui_window */
+ BW_CREATE_CLONE = (1 << 2),
+
+ /** Window not opened by user interaction (e.g. JS popup)
+ *
+ * rfc2965:
+ * A transaction is verifiable if the user, or a
+ * user-designated agent, has the option to review
+ * the request-URI prior to its use in the transaction.
+ * A transaction is unverifiable if the user does not
+ * have that option.
+ */
+ BW_CREATE_UNVERIFIABLE = (1 << 3),
+};
+
+/** flags to browser_window_navigate */
+enum browser_window_nav_flags {
+ /** No flags set */
+ BW_NAVIGATE_NONE = 0,
+
+ /** this will form a new history node (don't set for back/reload/etc) */
+ BW_NAVIGATE_HISTORY = (1 << 0),
+
+ /** download rather than render the uri */
+ BW_NAVIGATE_DOWNLOAD = (1 << 1),
+
+ /** Transation not caused by user interaction (e.g. JS-caused)
+ *
+ * rfc2965:
+ * A transaction is verifiable if the user, or a
+ * user-designated agent, has the option to review
+ * the request-URI prior to its use in the transaction.
+ * A transaction is unverifiable if the user does not
+ * have that option.
+ */
+ BW_NAVIGATE_UNVERIFIABLE = (1 << 2)
+};
+
+/**
+ * Page features at a specific spatial location.
+ */
+struct browser_window_features {
+ /** URL of a link or NULL. */
+ struct nsurl *link;
+
+ /** Object at position or NULL. */
+ struct hlcache_handle *object;
+
+ /** handle of top level content. */
+ struct hlcache_handle *main;
+
+ /** type of form feature. */
+ enum {
+ CTX_FORM_NONE,
+ CTX_FORM_TEXT,
+ CTX_FORM_FILE
+ } form_features;
+};
+
+/**
+ * Create and open a new root browser window with the given page.
+ *
+ * \param flags Flags to control operation
+ * \param url URL to fetch in the new window or NULL for blank
+ * \param referrer The referring uri or NULL if none
+ * \param existing The an existing bw or NULL, required for some flags.
+ * \param bw Updated to created browser window or untouched on error.
+ * \return NSERROR_OK, or appropriate error otherwise.
+ */
+nserror browser_window_create(enum browser_window_create_flags flags,
+ struct nsurl *url, struct nsurl *referrer,
+ struct browser_window *existing,
+ struct browser_window **bw);
+
+/**
+ * Start fetching a page in a browser window.
+ *
+ * \param bw browser window
+ * \param url URL to start fetching
+ * \param flags Flags to control operation
+ * \param referrer The referring uri or NULL if none
+ * \param post_urlenc url encoded post data or NULL if none
+ * \param post_multipart multipart post data or NULL if none
+ * \param parent Parent content or NULL if none
+ *
+ * Any existing fetches in the window are aborted.
+ *
+ * If post_urlenc and post_multipart are NULL the url is fetched using
+ * GET rather than POST.
+ *
+ */
+nserror browser_window_navigate(struct browser_window *bw,
+ struct nsurl *url,
+ struct nsurl *referrer,
+ enum browser_window_nav_flags flags,
+ char *post_urlenc,
+ struct fetch_multipart_data *post_multipart,
+ struct hlcache_handle *parent);
+
+/**
+ * Return true if a browser window can navigate upwards.
+ *
+ * \param bw the browser window to test.
+ * \return true if navigation up is possible otherwise false.
+ */
+bool browser_window_up_available(struct browser_window *bw);
+
+/**
+ * Navigate to a browser_window's parent URL.
+ *
+ * \param bw browser window
+ * \param new_window whether to open parent in a new window, or existing
+ */
+nserror browser_window_navigate_up(struct browser_window *bw, bool new_window);
+
+/**
+ * Get a browser window's URL.
+ *
+ * \param bw browser window
+ * \return pointer to nsurl. Doesn't create a ref for caller.
+ *
+ * \note guaranteed to return a valid nsurl ptr, never returns NULL.
+ */
+struct nsurl* browser_window_get_url(struct browser_window *bw);
+
+/**
+ * Get the title of a browser_window.
+ *
+ * \param bw The browser window.
+ */
+const char* browser_window_get_title(struct browser_window *bw);
+
+/**
+ * Get a browser window's history object.
+ *
+ * \param bw browser window
+ * \return pointer browser window's history object
+ *
+ * Clients need history object to make use of the history_* functions.
+ */
+struct history * browser_window_get_history(struct browser_window *bw);
+
+/**
+ * Get a browser window's content extents.
+ *
+ * \param bw browser window
+ * \param scaled whether to apply current browser window scale
+ * \param width updated to content width extent in px
+ * \param height updated to content height extent in px
+ * \return NSERROR_OK, or appropriate error otherwise.
+ */
+nserror browser_window_get_extents(struct browser_window *bw, bool scaled,
+ int *width, int *height);
+
+/**
+ * Find out if a browser window is currently showing a content.
+ *
+ * \param bw browser window
+ * \return true iff browser window is showing a content, else false.
+ */
+bool browser_window_has_content(struct browser_window *bw);
+
+/**
+ * Get a cache handle for the content within a browser window.
+ */
+struct hlcache_handle *browser_window_get_content(struct browser_window *bw);
+
+/**
+ * Set the dimensions of the area a browser window occupies
+ *
+ * \param bw The browser window to set dimensions of
+ * \param width Width in pixels
+ * \param height Height in pixels
+ */
+void browser_window_set_dimensions(struct browser_window *bw,
+ int width, int height);
+
+/**
+ * Redraw browser window, set extent to content, and update title.
+ *
+ * \param bw browser_window
+ * \param scroll_to_top move view to top of page
+ */
+void browser_window_update(struct browser_window *bw, bool scroll_to_top);
+
+/**
+ * update an area of a browser window.
+ *
+ * \param bw The browser window to update.
+ * \param rect The area to redraw
+ */
+void browser_window_update_box(struct browser_window *bw, struct rect *rect);
+
+/**
+ * Stop all fetching activity in a browser window.
+ *
+ * \param bw The browser window to stop activity in.
+ */
+void browser_window_stop(struct browser_window *bw);
+
+/**
+ * Reload the page in a browser window.
+ *
+ * \param bw browser window
+ * \param all whether to reload all objects associated with the page
+ */
+void browser_window_reload(struct browser_window *bw, bool all);
+
+/**
+ * Close and destroy a browser window.
+ *
+ * \param bw browser window
+ */
+void browser_window_destroy(struct browser_window *bw);
+
+/**
+ * Reformat a browser window contents to a new width or height.
+ *
+ * \param bw The browser window to reformat.
+ * \param background Reformat in the background.
+ * \param width new width
+ * \param height new height
+ */
+void browser_window_reformat(struct browser_window *bw, bool background,
+ int width, int height);
+
+
+/**
+ * Sets the scale of a browser window.
+ *
+ * \param bw The browser window to scale.
+ * \param scale The new scale.
+ * \param all Scale all windows in the tree (ie work up as well as down)
+ */
+void browser_window_set_scale(struct browser_window *bw, float scale, bool all);
+
+
+/**
+ * Gets the scale of a browser window
+ *
+ * \param bw The browser window to get the scale of.
+ * \return The scale of the window.
+ */
+float browser_window_get_scale(struct browser_window *bw);
+
+/**
+ * Get access to any page features at the given coordinates.
+ *
+ * Fetches page features like content, link URLs and objects (images)
+ * at the specified co-ordinates within the browsing context.
+ *
+ * Fields within the supplied features structure are updated with
+ * pointers to any relevent content, or set to NULL if none.
+ *
+ * \param[in] bw browser window to examine.
+ * \param[in] x x-coordinate of point of interest
+ * \param[in] y y-coordinate of point of interest
+ * \param[out] data Feature structure to update.
+ * \return NSERROR_OK or appropriate error code on faliure.
+ */
+nserror browser_window_get_features(struct browser_window *bw,
+ int x, int y, struct browser_window_features *data);
+
+/**
+ * Send a scroll request to a browser window at a particular point. The
+ * 'deepest' scrollable object which can be scrolled in the requested
+ * direction at the given point will consume the scroll.
+ *
+ * \param bw browser window to look inside
+ * \param x x-coordinate of point of interest
+ * \param y y-coordinate of point of interest
+ * \param scrx number of px try to scroll something in x direction
+ * \param scry number of px try to scroll something in y direction
+ * \return true iff scroll request has been consumed
+ */
+bool browser_window_scroll_at_point(struct browser_window *bw,
+ int x, int y, int scrx, int scry);
+
+/**
+ * Drop a file onto a browser window at a particular point, or determine if a
+ * file may be dropped onto the content at given point.
+ *
+ * \param bw browser window to look inside
+ * \param x x-coordinate of point of interest
+ * \param y y-coordinate of point of interest
+ * \param file path to file to be dropped, or NULL to know if drop allowed
+ * \return true iff file drop has been handled, or if drop possible (NULL file)
+ */
+bool browser_window_drop_file_at_point(struct browser_window *bw,
+ int x, int y, char *file);
+
+/**
+ * set filename on form control.
+ *
+ * \param bw browser window to look inside.
+ * \param gadget form control.
+ * \param fn filename to set.
+ */
+void browser_window_set_gadget_filename(struct browser_window *bw,
+ struct form_control *gadget, const char *fn);
+
+/**
+ * Update URL bar for a given browser window to bw's content's URL
+ *
+ * \param bw Browser window to update URL bar for.
+ */
+nserror browser_window_refresh_url_bar(struct browser_window *bw);
+
+/**
+ * Handle mouse clicks in a browser window.
+ *
+ * \param bw browser window
+ * \param mouse state of mouse buttons and modifier keys
+ * \param x coordinate of mouse
+ * \param y coordinate of mouse
+ */
+void browser_window_mouse_click(struct browser_window *bw,
+ browser_mouse_state mouse, int x, int y);
+
+/**
+ * Handle non-click mouse action in a browser window. (drag ends, movements)
+ *
+ * \param bw browser window
+ * \param mouse state of mouse buttons and modifier keys
+ * \param x coordinate of mouse
+ * \param y coordinate of mouse
+ */
+void browser_window_mouse_track(struct browser_window *bw,
+ browser_mouse_state mouse, int x, int y);
+
+/**
+ * Locate a browser window in the specified stack according.
+ *
+ * \param bw the browser_window to search all relatives of
+ * \param target the target to locate
+ * \param mouse The current mouse state
+ * \return The browser window the mouse is in
+ */
+struct browser_window *browser_window_find_target(
+ struct browser_window *bw, const char *target,
+ browser_mouse_state mouse);
+
+/**
+ * Cause the frontends reformat entry to be called in safe context.
+ *
+ * The browser_window_reformat call cannot safely be called from some
+ * contexts, this call allows for the reformat to happen from a safe
+ * top level context.
+ *
+ * The callback is frontend provided as the context information (size
+ * etc.) about the windowing toolkit is only available to the
+ * frontend.
+ */
+nserror browser_window_schedule_reformat(struct browser_window *bw);
+
+
+
+void browser_select_menu_callback(void *client_data,
+ int x, int y, int width, int height);
+
+/**
+ * Redraw a rectangular region of a browser window.
+ *
+ * \param bw browser window to be redrawn
+ * \param x x co-ord of top-left
+ * \param y y co-ord of top-left
+ * \param width width of rectangle
+ * \param height height of rectangle
+ */
+void browser_window_redraw_rect(struct browser_window *bw, int x, int y,
+ int width, int height);
+
+/**
+ * Change the shape of the mouse pointer
+ *
+ * \param bw Browser window to set shape in
+ * \param shape The pointer shape to use
+ */
+void browser_window_set_pointer(struct browser_window *bw,
+ browser_pointer_shape shape);
+
+/**
+ * Start drag scrolling the contents of the browser window
+ *
+ * \param bw browser window
+ * \param x x ordinate of initial mouse position
+ * \param y y ordinate
+ */
+void browser_window_page_drag_start(struct browser_window *bw, int x, int y);
+
+/**
+ * Check availability of Back action for a given browser window
+ *
+ * \param bw browser window
+ * \return true if Back action is available
+ */
+bool browser_window_back_available(struct browser_window *bw);
+
+/**
+ * Check availability of Forward action for a given browser window
+ *
+ * \param bw browser window
+ * \return true if Forward action is available
+ */
+bool browser_window_forward_available(struct browser_window *bw);
+
+/**
+ * Check availability of Reload action for a given browser window
+ *
+ * \param bw browser window
+ * \return true if Reload action is available
+ */
+bool browser_window_reload_available(struct browser_window *bw);
+
+/**
+ * Check availability of Stop action for a given browser window
+ *
+ * \param bw browser window
+ * \return true if Stop action is available
+ */
+bool browser_window_stop_available(struct browser_window *bw);
+
+/**
+ * Redraw an area of a window.
+ *
+ * Calls the redraw function for the content.
+ *
+ * \param bw The window to redraw
+ * \param x coordinate for top-left of redraw
+ * \param y coordinate for top-left of redraw
+ * \param clip clip rectangle coordinates
+ * \param ctx redraw context
+ * \return true if successful, false otherwise
+ *
+ * The clip rectangle is guaranteed to be filled to its extents, so there is
+ * no need to render a solid background first.
+ *
+ * x, y and clip are coordinates from the top left of the canvas area.
+ *
+ * The top left corner of the clip rectangle is (x0, y0) and
+ * the bottom right corner of the clip rectangle is (x1, y1).
+ * Units for x, y and clip are pixels.
+ */
+bool browser_window_redraw(struct browser_window *bw, int x, int y,
+ const struct rect *clip, const struct redraw_context *ctx);
+
+/**
+ * Check whether browser window is ready for redraw
+ *
+ * \param bw The window to redraw
+ * \return true if browser window is ready for redraw
+ */
+bool browser_window_redraw_ready(struct browser_window *bw);
+
+/**
+ * Get the position of the current browser window with respect to the root or
+ * parent browser window
+ *
+ * \param bw browser window to get the position of
+ * \param root true if we want position wrt root bw, false if wrt parent bw
+ * \param pos_x updated to x position of bw
+ * \param pos_y updated to y position of bw
+ */
+void browser_window_get_position(struct browser_window *bw, bool root,
+ int *pos_x, int *pos_y);
+
+/**
+ * Set the position of the current browser window with respect to the parent
+ * browser window
+ *
+ * \param bw browser window to set the position of
+ * \param x x position of bw
+ * \param y y position of bw
+ */
+void browser_window_set_position(struct browser_window *bw, int x, int y);
+
+/**
+ * Scroll the browser window to display the passed area
+ *
+ * \param bw browser window to scroll
+ * \param rect area to display
+ */
+void browser_window_scroll_visible(struct browser_window *bw,
+ const struct rect *rect);
+
+/**
+ * Set scroll offsets for a browser window.
+ *
+ * \param bw The browser window
+ * \param x The x scroll offset to set
+ * \param y The y scroll offset to set
+ *
+ * \todo Do we really need this and browser_window_scroll_visible?
+ * Ditto for gui_window_* variants.
+ */
+void browser_window_set_scroll(struct browser_window *bw, int x, int y);
+
+/**
+ * Set drag type for a browser window, and inform front end
+ *
+ * \param bw browser window to set the type of the current drag for
+ * \param type drag type
+ * \param rect area pointer may be confined to, during drag, or NULL
+ */
+void browser_window_set_drag_type(struct browser_window *bw,
+ browser_drag_type type, const struct rect *rect);
+
+/**
+ * Get type of any current drag for a browser window
+ *
+ * \param bw browser window to set the type of the current drag for
+ * \return drag type
+ */
+browser_drag_type browser_window_get_drag_type(struct browser_window *bw);
+
+/**
+ * Check whether browser window can accept a cut/copy/paste, or has a selection
+ * that could be saved.
+ *
+ * \param bw The browser window
+ * \return flags indicating editor flags
+ */
+browser_editor_flags browser_window_get_editor_flags(struct browser_window *bw);
+
+/**
+ * Find out if given browser window content is selectable
+ *
+ * \param bw browser window to look at
+ * \return true iff browser window is selectable
+ */
+bool browser_window_can_select(struct browser_window *bw);
+
+/**
+ * Get the current selection from a root browser window, ownership passed to
+ * caller, who must free() it.
+ *
+ * \param bw The browser window
+ * \return the selected text string, or NULL
+ */
+char * browser_window_get_selection(struct browser_window *bw);
+
+/**
+ * Find out if given browser window can be searched
+ *
+ * \param bw browser window to look at
+ * \return true iff browser window is searchable
+ */
+bool browser_window_can_search(struct browser_window *bw);
+
+/**
+ * Find out if a browser window contains a frameset
+ *
+ * \param bw browser window to look at
+ * \return true iff browser window contains a frameset
+ */
+bool browser_window_is_frameset(struct browser_window *bw);
+
+/**
+ * Get the browser window's scrollbar details.
+ *
+ * Vertical and horizontal scrollbars may be {YES|NO|AUTO}, although
+ * it is entirely up to the front end whether this is implemented.
+ * e.g. if the gui toolkit style-guide says all windows must have
+ * scrollbars then this API can be ignored.
+ *
+ * \param bw browser window to look at
+ * \param h Updated to indicate horizontal scrollbar type
+ * \param v Updated to indicate vertical scrollbar type
+ * \return NSERROR_OK, or appropriate error otherwise
+ */
+nserror browser_window_get_scrollbar_type(struct browser_window *bw,
+ browser_scrolling *h, browser_scrolling *v);
+
+/**
+ * Set the DPI of the browser.
+ *
+ * \param dpi The DPI to set.
+ */
+nserror browser_set_dpi(int dpi);
+
+/**
+ * Get the browser DPI.
+ *
+ * \return The DPI in use.
+ */
+int browser_get_dpi(void);
+
+/**
+ * Dump debug info concerning the browser window's contents to file
+ *
+ * \param bw The browser window.
+ * \param f The file to dump to.
+ * \param op The debug operation type to dump.
+ * \return NSERROR_OK on success or error code on faliure.
+ */
+nserror browser_window_debug_dump(struct browser_window *bw, FILE *f, enum content_debug op);
+
+/**
+ * Set debug options on a window
+ *
+ * \param bw The browser window.
+ * \param op The debug operation type.
+ * \return NSERROR_OK on success or error code on faliure.
+ */
+nserror browser_window_debug(struct browser_window *bw, enum content_debug op);
+
+/**
+ * Obtain a browsing contexts name.
+ *
+ * The returned pointer is owned bu the browsing context and is only
+ * valid untill the next operation on that context.
+ * The returned name may be NULL if no name has been set.
+ * \todo This does not consider behaviour wrt frames
+ *
+ * \param bw The browser window.
+ * \param name recives result string.
+ * \return NSERROR_OK
+ */
+nserror browser_window_get_name(struct browser_window *bw, const char **name);
+
+/**
+ * Set a browsing contexts name.
+ *
+ * Changes a browsing contexts name to a copy of that passed and the
+ * value is not subsequently referenced.
+ *
+ * \param bw The browser window.
+ * \param name The name string to set.
+ * \return NSERROR_OK and the name is updated or NSERROR_NOMEM and the
+ * original name is untouched.
+ */
+nserror browser_window_set_name(struct browser_window *bw, const char *name);
+
+#endif
diff --git a/javascript/duktape/Location.bnd b/javascript/duktape/Location.bnd
index fbb0e4a..ca7e905 100644
--- a/javascript/duktape/Location.bnd
+++ b/javascript/duktape/Location.bnd
@@ -15,7 +15,7 @@ class Location {
prologue Location()
%{
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
%}
init Location(nsurl *url)
diff --git a/javascript/duktape/Window.bnd b/javascript/duktape/Window.bnd
index 81d5280..c9fc3ca 100644
--- a/javascript/duktape/Window.bnd
+++ b/javascript/duktape/Window.bnd
@@ -13,7 +13,7 @@ class Window {
private struct html_content * htmlc;
prologue %{
#include "utils/nsurl.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "render/html.h"
#include "render/html_internal.h"
%};
diff --git a/javascript/jsapi/location.bnd b/javascript/jsapi/location.bnd
index f64f633..96c0a30 100644
--- a/javascript/jsapi/location.bnd
+++ b/javascript/jsapi/location.bnd
@@ -17,7 +17,7 @@ hdrcomment " http://www.opensource.org/licenses/mit-license";
preamble %{
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "utils/config.h"
#include "utils/log.h"
diff --git a/render/box_textarea.c b/render/box_textarea.c
index 4e4adff..7f07654 100644
--- a/render/box_textarea.c
+++ b/render/box_textarea.c
@@ -22,7 +22,6 @@
#include <dom/dom.h>
-#include "desktop/browser.h"
#include "desktop/textarea.h"
#include "desktop/textinput.h"
#include "utils/log.h"
diff --git a/render/form.c b/render/form.c
index b3a8c51..b07acdb 100644
--- a/render/form.c
+++ b/render/form.c
@@ -43,7 +43,7 @@
#include "content/fetch.h"
#include "content/hlcache.h"
#include "content/handlers/css/utils.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/knockout.h"
#include "desktop/plot_style.h"
diff --git a/render/html.c b/render/html.c
index 8307cdc..7e2f271 100644
--- a/render/html.c
+++ b/render/html.c
@@ -48,7 +48,7 @@
#include "desktop/textarea.h"
#include "netsurf/bitmap.h"
#include "javascript/js.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/utf8.h"
#include "netsurf/layout.h"
#include "netsurf/misc.h"
diff --git a/render/html.h b/render/html.h
index 2900e89..5d2e459 100644
--- a/render/html.h
+++ b/render/html.h
@@ -31,7 +31,7 @@
#include <dom/bindings/hubbub/parser.h>
#include "content/content_type.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/plot_style.h"
#include "desktop/frame_types.h"
diff --git a/render/html_forms.c b/render/html_forms.c
index fe289f2..0d56e1c 100644
--- a/render/html_forms.c
+++ b/render/html_forms.c
@@ -19,8 +19,6 @@
#include "utils/corestrings.h"
#include "utils/log.h"
-#include "desktop/browser.h"
-
#include "render/form_internal.h"
#include "render/html_internal.h"
diff --git a/render/html_interaction.c b/render/html_interaction.c
index 9513d0f..3a54825 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -35,7 +35,7 @@
#include "utils/log.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/frames.h"
#include "netsurf/mouse.h"
#include "utils/nsoption.h"
diff --git a/render/html_redraw.c b/render/html_redraw.c
index e70f9be..40783c3 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -42,7 +42,7 @@
#include "utils/nsoption.h"
#include "content/content_protected.h"
#include "content/handlers/css/utils.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "desktop/selection.h"
#include "desktop/print.h"
diff --git a/render/layout.c b/render/layout.c
index c86ccd7..48c8677 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -49,7 +49,7 @@
#include "utils/nsoption.h"
#include "content/content_protected.h"
#include "content/handlers/css/utils.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
#include "netsurf/layout.h"
diff --git a/render/textplain.c b/render/textplain.c
index 9fe560d..2323f43 100644
--- a/render/textplain.c
+++ b/render/textplain.c
@@ -40,7 +40,7 @@
#include "content/content_protected.h"
#include "content/hlcache.h"
#include "content/handlers/css/utils.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "utils/nsoption.h"
#include "desktop/plotters.h"
#include "desktop/search.h"
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=8711fbe47dd0381efd0...
commit 8711fbe47dd0381efd09717b719b79be3d819f49
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
move mouse and pointer state header into public API
diff --git a/content/content.h b/content/content.h
index cdd7283..1c75077 100644
--- a/content/content.h
+++ b/content/content.h
@@ -32,7 +32,7 @@
#include "content/content_factory.h"
#include "content/content_type.h"
#include "desktop/search.h" /* search flags enum */
-#include "desktop/mouse.h" /* mouse state enums */
+#include "netsurf/mouse.h" /* mouse state enums */
#include "desktop/plot_style.h" /* color typedef */
struct browser_window;
diff --git a/desktop/browser.h b/desktop/browser.h
index a1ec37a..35eab0e 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -30,7 +30,7 @@
#include "utils/errors.h"
#include "desktop/plot_style.h"
#include "desktop/frame_types.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
struct browser_window;
struct hlcache_handle;
diff --git a/desktop/mouse.h b/desktop/mouse.h
deleted file mode 100644
index 083bd17..0000000
--- a/desktop/mouse.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2003 Phil Mellor <monkeyson(a)users.sourceforge.net>
- * Copyright 2006 James Bursa <bursa(a)users.sourceforge.net>
- * Copyright 2010 Michael Drake <tlsa(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-/** \file
- * Core mouse state.
- */
-
-#ifndef _NETSURF_DESKTOP_MOUSE_H_
-#define _NETSURF_DESKTOP_MOUSE_H_
-
-/* Mouse state. 1 is primary mouse button (e.g. Select on RISC OS).
- * 2 is secondary mouse button (e.g. Adjust on RISC OS). */
-typedef enum browser_mouse_state {
- BROWSER_MOUSE_HOVER = 0, /* No mouse buttons pressed,
- * May be used to indicate
- * hover or end of drag. */
-
- BROWSER_MOUSE_PRESS_1 = (1 << 0), /* button 1 pressed */
- BROWSER_MOUSE_PRESS_2 = (1 << 1), /* button 2 pressed */
-
- /* note: click meaning is different for
- * different front ends. On RISC OS, it
- * is standard to act on press, so a
- * click is fired at the same time as a
- * mouse button is pressed. With GTK, it
- * is standard to act on release, so a
- * click is fired when the mouse button
- * is released, if the operation wasn't
- * a drag. */
-
- BROWSER_MOUSE_CLICK_1 = (1 << 2), /* button 1 clicked. */
- BROWSER_MOUSE_CLICK_2 = (1 << 3), /* button 2 clicked. */
-
- BROWSER_MOUSE_DOUBLE_CLICK = (1 << 4), /* button double clicked */
- BROWSER_MOUSE_TRIPLE_CLICK = (1 << 5), /* button triple clicked */
-
- /* note: double and triple clicks are
- * fired alongside a
- * BROWSER_MOUSE_CLICK_[1|2]
- * to indicate which button
- * is used.
- */
-
- BROWSER_MOUSE_DRAG_1 = (1 << 6), /* start of button 1 drag */
- BROWSER_MOUSE_DRAG_2 = (1 << 7), /* start of button 2 drag */
-
- BROWSER_MOUSE_DRAG_ON = (1 << 8), /* a drag operation was started
- * and a mouse button is still
- * pressed */
-
- BROWSER_MOUSE_HOLDING_1 = (1 << 9), /* during button 1 drag */
- BROWSER_MOUSE_HOLDING_2 = (1 << 10), /* during button 2 drag */
-
-
- BROWSER_MOUSE_MOD_1 = (1 << 11), /* 1st modifier key pressed
- * (eg. Shift) */
- BROWSER_MOUSE_MOD_2 = (1 << 12), /* 2nd modifier key pressed
- * (eg. Ctrl) */
- BROWSER_MOUSE_MOD_3 = (1 << 13) /* 3rd modifier key pressed
- * (eg. Alt) */
-} browser_mouse_state;
-
-
-typedef enum gui_pointer_shape {
- GUI_POINTER_DEFAULT, GUI_POINTER_POINT, GUI_POINTER_CARET,
- GUI_POINTER_MENU, GUI_POINTER_UP, GUI_POINTER_DOWN,
- GUI_POINTER_LEFT, GUI_POINTER_RIGHT, GUI_POINTER_RU,
- GUI_POINTER_LD, GUI_POINTER_LU, GUI_POINTER_RD,
- GUI_POINTER_CROSS, GUI_POINTER_MOVE, GUI_POINTER_WAIT,
- GUI_POINTER_HELP, GUI_POINTER_NO_DROP, GUI_POINTER_NOT_ALLOWED,
- GUI_POINTER_PROGRESS } gui_pointer_shape;
-
-/** Mouse pointer type */
-typedef enum {
- BROWSER_POINTER_DEFAULT = GUI_POINTER_DEFAULT,
- BROWSER_POINTER_POINT = GUI_POINTER_POINT,
- BROWSER_POINTER_CARET = GUI_POINTER_CARET,
- BROWSER_POINTER_MENU = GUI_POINTER_MENU,
- BROWSER_POINTER_UP = GUI_POINTER_UP,
- BROWSER_POINTER_DOWN = GUI_POINTER_DOWN,
- BROWSER_POINTER_LEFT = GUI_POINTER_LEFT,
- BROWSER_POINTER_RIGHT = GUI_POINTER_RIGHT,
- BROWSER_POINTER_RU = GUI_POINTER_RU,
- BROWSER_POINTER_LD = GUI_POINTER_LD,
- BROWSER_POINTER_LU = GUI_POINTER_LU,
- BROWSER_POINTER_RD = GUI_POINTER_RD,
- BROWSER_POINTER_CROSS = GUI_POINTER_CROSS,
- BROWSER_POINTER_MOVE = GUI_POINTER_MOVE,
- BROWSER_POINTER_WAIT = GUI_POINTER_WAIT,
- BROWSER_POINTER_HELP = GUI_POINTER_HELP,
- BROWSER_POINTER_NO_DROP = GUI_POINTER_NO_DROP,
- BROWSER_POINTER_NOT_ALLOWED = GUI_POINTER_NOT_ALLOWED,
- BROWSER_POINTER_PROGRESS = GUI_POINTER_PROGRESS,
- BROWSER_POINTER_AUTO
-} browser_pointer_shape;
-
-
-void browser_mouse_state_dump(browser_mouse_state mouse);
-
-#endif
diff --git a/desktop/scrollbar.c b/desktop/scrollbar.c
index 82fcac1..64b7671 100644
--- a/desktop/scrollbar.c
+++ b/desktop/scrollbar.c
@@ -32,7 +32,7 @@
#include "desktop/browser.h"
#include "desktop/system_colour.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/scrollbar.h"
#include "desktop/plotters.h"
#include "desktop/plot_style.h"
diff --git a/desktop/selection.c b/desktop/selection.c
index d2e326a..7c1d15c 100644
--- a/desktop/selection.c
+++ b/desktop/selection.c
@@ -37,7 +37,7 @@
#include "render/font.h"
#include "render/textplain.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/browser_private.h"
#include "desktop/plotters.h"
#include "desktop/save_text.h"
diff --git a/desktop/selection.h b/desktop/selection.h
index 7e620fc..e2bc3b3 100644
--- a/desktop/selection.h
+++ b/desktop/selection.h
@@ -24,7 +24,7 @@
#define _NETSURF_DESKTOP_SELECTION_H_
#include <stdbool.h>
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
struct box;
diff --git a/desktop/sslcert_viewer.h b/desktop/sslcert_viewer.h
index 92f402f..f7c8f33 100644
--- a/desktop/sslcert_viewer.h
+++ b/desktop/sslcert_viewer.h
@@ -22,7 +22,7 @@
#define _NETSURF_DESKTOP_SSLCERT_VIEWER_H_
#include "content/llcache.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
struct sslcert_session_data;
struct redraw_context;
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 157d6c1..804c78c 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -32,7 +32,7 @@
#include "content/handlers/css/utils.h"
#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/textarea.h"
#include "desktop/textinput.h"
#include "desktop/plotters.h"
diff --git a/desktop/textinput.c b/desktop/textinput.c
index 015c669..0e98e03 100644
--- a/desktop/textinput.c
+++ b/desktop/textinput.c
@@ -38,7 +38,7 @@
#include "render/html_internal.h"
#include "render/layout.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/browser_private.h"
#include "desktop/textinput.h"
#include "netsurf/window.h"
diff --git a/desktop/tree.h b/desktop/tree.h
index b4e0f66..f8864e1 100644
--- a/desktop/tree.h
+++ b/desktop/tree.h
@@ -27,7 +27,7 @@
#include <stdbool.h>
#include <stdint.h>
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
struct sslcert_session_data;
struct tree;
diff --git a/desktop/treeview.h b/desktop/treeview.h
index d4d4ce9..5369569 100644
--- a/desktop/treeview.h
+++ b/desktop/treeview.h
@@ -26,7 +26,7 @@
#include <stdbool.h>
#include <stdint.h>
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/core_window.h"
#include "desktop/textinput.h"
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index 506ae33..791295f 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -48,7 +48,7 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "content/hlcache.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "netsurf/bitmap.h"
diff --git a/frontends/amiga/cookies.c b/frontends/amiga/cookies.c
index 3181d0f..c775c83 100755
--- a/frontends/amiga/cookies.c
+++ b/frontends/amiga/cookies.c
@@ -19,7 +19,7 @@
#include <proto/exec.h>
#include "desktop/cookie_manager.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "amiga/cookies.h"
diff --git a/frontends/amiga/ctxmenu.c b/frontends/amiga/ctxmenu.c
index cc612da..5951a10 100644
--- a/frontends/amiga/ctxmenu.c
+++ b/frontends/amiga/ctxmenu.c
@@ -43,7 +43,7 @@
#include "content/hlcache.h"
#include "desktop/browser.h"
#include "desktop/browser_history.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c
index 8b122ec..b1526b9 100644
--- a/frontends/amiga/download.c
+++ b/frontends/amiga/download.c
@@ -51,7 +51,7 @@
#include "desktop/download.h"
#include "desktop/save_complete.h"
#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "netsurf/download.h"
#include "content/handlers/image/ico.h"
diff --git a/frontends/amiga/drag.c b/frontends/amiga/drag.c
index 67d1722..122ecd1 100644
--- a/frontends/amiga/drag.c
+++ b/frontends/amiga/drag.c
@@ -35,7 +35,7 @@
#include "utils/utils.h"
#include "utils/nsoption.h"
#include "content/hlcache.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "amiga/bitmap.h"
#include "amiga/clipboard.h"
diff --git a/frontends/amiga/font_scan.c b/frontends/amiga/font_scan.c
index 12fb607..c1c1732 100644
--- a/frontends/amiga/font_scan.c
+++ b/frontends/amiga/font_scan.c
@@ -48,7 +48,7 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "amiga/font_scan.h"
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index ae70086..ebc7f87 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -104,7 +104,7 @@
#include "desktop/browser_history.h"
#include "desktop/browser.h"
#include "desktop/hotlist.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/netsurf.h"
#include "desktop/version.h"
#include "desktop/save_complete.h"
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index 10e89cd..c5c1c31 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -26,7 +26,7 @@
#include <devices/inputevent.h>
#include "netsurf/window.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "amiga/menu.h"
#include "amiga/object.h"
diff --git a/frontends/amiga/history.c b/frontends/amiga/history.c
index 61425f3..bc16d30 100755
--- a/frontends/amiga/history.c
+++ b/frontends/amiga/history.c
@@ -20,7 +20,7 @@
#include <proto/exec.h>
#include "utils/errors.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "amiga/history.h"
diff --git a/frontends/amiga/hotlist.c b/frontends/amiga/hotlist.c
index 71720cb..4469174 100755
--- a/frontends/amiga/hotlist.c
+++ b/frontends/amiga/hotlist.c
@@ -21,7 +21,7 @@
#include "utils/nsurl.h"
#include "desktop/hotlist.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "amiga/hotlist.h"
diff --git a/frontends/amiga/login.c b/frontends/amiga/login.c
index 3458515..d54c2fa 100755
--- a/frontends/amiga/login.c
+++ b/frontends/amiga/login.c
@@ -41,7 +41,7 @@
#include "utils/messages.h"
#include "utils/errors.h"
#include "content/urldb.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "amiga/gui.h"
diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c
index 969a65d..0743bc7 100644
--- a/frontends/amiga/menu.c
+++ b/frontends/amiga/menu.c
@@ -50,7 +50,7 @@
#include "content/hlcache.h"
#include "desktop/hotlist.h"
#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "desktop/textinput.h"
#include "desktop/version.h"
diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index 1f74081..fee3e7b 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -38,7 +38,7 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "netsurf/css.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "amiga/plotters.h"
diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c
index 573daf3..f4cd314 100644
--- a/frontends/amiga/print.c
+++ b/frontends/amiga/print.c
@@ -53,7 +53,7 @@
#include "desktop/printer.h"
#include "desktop/print.h"
#include "netsurf/layout.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "content/hlcache.h"
diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c
index 2ecb7af..86a27cf 100755
--- a/frontends/amiga/search.c
+++ b/frontends/amiga/search.c
@@ -50,7 +50,7 @@
#include "content/content.h"
#include "desktop/browser.h"
#include "desktop/search.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "netsurf/search.h"
diff --git a/frontends/amiga/selectmenu.c b/frontends/amiga/selectmenu.c
index 2593178..ffd4803 100644
--- a/frontends/amiga/selectmenu.c
+++ b/frontends/amiga/selectmenu.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "render/form.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "amiga/gui.h"
#include "amiga/selectmenu.h"
diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c
index ca6501a..ed72061 100644
--- a/frontends/amiga/sslcert.c
+++ b/frontends/amiga/sslcert.c
@@ -20,7 +20,7 @@
#include "utils/nsurl.h"
#include "content/llcache.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "desktop/sslcert_viewer.h"
diff --git a/frontends/amiga/theme.c b/frontends/amiga/theme.c
index f4fed12..f0fa31d 100644
--- a/frontends/amiga/theme.c
+++ b/frontends/amiga/theme.c
@@ -41,7 +41,7 @@
#include "utils/nsoption.h"
#include "utils/utils.h"
#include "desktop/searchweb.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "amiga/gui.h"
diff --git a/frontends/atari/bitmap.c b/frontends/atari/bitmap.c
index 35886c0..d0de378 100644
--- a/frontends/atari/bitmap.c
+++ b/frontends/atari/bitmap.c
@@ -25,7 +25,7 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "netsurf/bitmap.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "atari/bitmap.h"
#include "atari/plot/plot.h"
diff --git a/frontends/atari/cookies.c b/frontends/atari/cookies.c
index 6019b47..eff4ad8 100644
--- a/frontends/atari/cookies.c
+++ b/frontends/atari/cookies.c
@@ -20,7 +20,7 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/plotters.h"
#include "desktop/cookie_manager.h"
#include "desktop/core_window.h"
diff --git a/frontends/atari/font.c b/frontends/atari/font.c
index f6b91c8..a90b795 100644
--- a/frontends/atari/font.c
+++ b/frontends/atari/font.c
@@ -25,7 +25,7 @@
#include "utils/log.h"
#include "utils/nsoption.h"
#include "netsurf/layout.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/plotters.h"
#include "atari/gui.h"
diff --git a/frontends/atari/gui.h b/frontends/atari/gui.h
index 50184d0..9c9aaaa 100644
--- a/frontends/atari/gui.h
+++ b/frontends/atari/gui.h
@@ -22,7 +22,7 @@
#include <stdbool.h>
#include <mt_gem.h>
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "atari/redrawslots.h"
#include "atari/gemtk/gemtk.h"
diff --git a/frontends/atari/history.c b/frontends/atari/history.c
index ba72c7f..d8b582e 100644
--- a/frontends/atari/history.c
+++ b/frontends/atari/history.c
@@ -21,7 +21,7 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/global_history.h"
#include "desktop/core_window.h"
diff --git a/frontends/atari/misc.c b/frontends/atari/misc.c
index 8688b93..c5a7052 100644
--- a/frontends/atari/misc.c
+++ b/frontends/atari/misc.c
@@ -29,7 +29,7 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/cookie_manager.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/tree.h"
#include "utils/nsoption.h"
#include "utils/messages.h"
diff --git a/frontends/atari/plot/font_freetype.c b/frontends/atari/plot/font_freetype.c
index a77aff8..6028207 100644
--- a/frontends/atari/plot/font_freetype.c
+++ b/frontends/atari/plot/font_freetype.c
@@ -24,7 +24,7 @@
#include "utils/log.h"
#include "utils/nsoption.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/plot_style.h"
#include "atari/gui.h"
diff --git a/frontends/atari/plot/font_internal.c b/frontends/atari/plot/font_internal.c
index 89a56d0..b96f4c7 100644
--- a/frontends/atari/plot/font_internal.c
+++ b/frontends/atari/plot/font_internal.c
@@ -24,7 +24,7 @@
#include "utils/utf8.h"
#include "utils/log.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/plot_style.h"
#include "atari/gui.h"
diff --git a/frontends/atari/plot/fontplot.c b/frontends/atari/plot/fontplot.c
index 9f0edd9..d0a1fe1 100644
--- a/frontends/atari/plot/fontplot.c
+++ b/frontends/atari/plot/fontplot.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <mt_gem.h>
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/plot_style.h"
#include "atari/bitmap.h"
diff --git a/frontends/atari/plot/plot.c b/frontends/atari/plot/plot.c
index f96039d..2e35bcd 100644
--- a/frontends/atari/plot/plot.c
+++ b/frontends/atari/plot/plot.c
@@ -31,7 +31,7 @@
#include "utils/utils.h"
#include "netsurf/bitmap.h"
#include "desktop/plotters.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "atari/gui.h"
#include "atari/osspec.h"
diff --git a/frontends/atari/rootwin.c b/frontends/atari/rootwin.c
index 605ce45..ca25a07 100644
--- a/frontends/atari/rootwin.c
+++ b/frontends/atari/rootwin.c
@@ -38,7 +38,7 @@
#include "utils/log.h"
#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/plotters.h"
#include "desktop/textinput.h"
#include "content/content.h"
diff --git a/frontends/atari/statusbar.c b/frontends/atari/statusbar.c
index c9d0f78..c05e1b4 100644
--- a/frontends/atari/statusbar.c
+++ b/frontends/atari/statusbar.c
@@ -28,7 +28,7 @@
#include <math.h>
#include "utils/log.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/plotters.h"
#include "atari/gui.h"
diff --git a/frontends/atari/toolbar.c b/frontends/atari/toolbar.c
index f630332..d2182c5 100644
--- a/frontends/atari/toolbar.c
+++ b/frontends/atari/toolbar.c
@@ -33,7 +33,7 @@
#include "utils/utf8.h"
#include "desktop/browser_history.h"
#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/plot_style.h"
#include "desktop/plotters.h"
#include "desktop/tree.h"
diff --git a/frontends/atari/treeview.c b/frontends/atari/treeview.c
index 513e2df..b474298 100644
--- a/frontends/atari/treeview.c
+++ b/frontends/atari/treeview.c
@@ -29,7 +29,7 @@
#include "utils/utils.h"
#include "content/urldb.h"
#include "desktop/plotters.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/treeview.h"
#include "atari/gui.h"
diff --git a/frontends/beos/cookies.cpp b/frontends/beos/cookies.cpp
index d1357ff..bf8ce51 100644
--- a/frontends/beos/cookies.cpp
+++ b/frontends/beos/cookies.cpp
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
extern "C" {
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "utils/log.h"
#include "desktop/cookie_manager.h"
#include "desktop/plotters.h"
diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp
index 27be987..5e75a02 100644
--- a/frontends/beos/window.cpp
+++ b/frontends/beos/window.cpp
@@ -30,7 +30,7 @@ extern "C" {
#include "content/content.h"
#include "content/urldb.h"
#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/textinput.h"
#include "desktop/plotters.h"
#include "netsurf/window.h"
diff --git a/frontends/cocoa/NetsurfApp.m b/frontends/cocoa/NetsurfApp.m
index f048ca6..c30bce0 100644
--- a/frontends/cocoa/NetsurfApp.m
+++ b/frontends/cocoa/NetsurfApp.m
@@ -38,7 +38,7 @@
#import "desktop/textinput.h"
#import "desktop/tree.h"
#import "render/html.h"
-#import "desktop/mouse.h"
+#import "netsurf/mouse.h"
#import "netsurf/netsurf.h"
#ifndef NETSURF_HOMEPAGE
diff --git a/frontends/cocoa/gui.m b/frontends/cocoa/gui.m
index 787fb68..7f39459 100644
--- a/frontends/cocoa/gui.m
+++ b/frontends/cocoa/gui.m
@@ -21,7 +21,7 @@
#import "utils/nsoption.h"
#import "utils/utils.h"
#import "utils/log.h"
-#import "desktop/mouse.h"
+#import "netsurf/mouse.h"
#import "netsurf/window.h"
#import "netsurf/misc.h"
#import "desktop/browser.h"
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index 5d49eeb..5c5d682 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -40,7 +40,7 @@
#include "gtk/window.h"
#include "gtk/selection.h"
#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
#include "netsurf/window.h"
diff --git a/frontends/monkey/browser.c b/frontends/monkey/browser.c
index 4ae35a1..638dcdb 100644
--- a/frontends/monkey/browser.c
+++ b/frontends/monkey/browser.c
@@ -25,7 +25,7 @@
#include "utils/ring.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "desktop/browser.h"
#include "desktop/plotters.h"
diff --git a/frontends/riscos/help.c b/frontends/riscos/help.c
index faabea7..64d4a2f 100644
--- a/frontends/riscos/help.c
+++ b/frontends/riscos/help.c
@@ -27,7 +27,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utf8.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "riscos/treeview.h"
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index d386685..2e012da 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -60,7 +60,7 @@
#include "desktop/cookie_manager.h"
#include "desktop/scrollbar.h"
#include "desktop/frames.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/plotters.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
diff --git a/frontends/windows/plot.c b/frontends/windows/plot.c
index d5ddf4f..7480bc6 100644
--- a/frontends/windows/plot.c
+++ b/frontends/windows/plot.c
@@ -28,7 +28,7 @@
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/utils.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "desktop/plotters.h"
diff --git a/frontends/windows/window.h b/frontends/windows/window.h
index ec54287..047cec6 100644
--- a/frontends/windows/window.h
+++ b/frontends/windows/window.h
@@ -22,7 +22,7 @@
/** The window operation function table for win32 */
extern struct gui_window_table *win32_window_table;
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
struct browser_mouse {
struct gui_window *gui;
diff --git a/include/netsurf/mouse.h b/include/netsurf/mouse.h
new file mode 100644
index 0000000..19cd3ea
--- /dev/null
+++ b/include/netsurf/mouse.h
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2003 Phil Mellor <monkeyson(a)users.sourceforge.net>
+ * Copyright 2006 James Bursa <bursa(a)users.sourceforge.net>
+ * Copyright 2010 Michael Drake <tlsa(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+/**
+ * \file
+ *
+ * Core mouse and pointer states.
+ */
+
+#ifndef _NETSURF_MOUSE_H_
+#define _NETSURF_MOUSE_H_
+
+/* Mouse state. 1 is primary mouse button (e.g. Select on RISC OS).
+ * 2 is secondary mouse button (e.g. Adjust on RISC OS). */
+typedef enum browser_mouse_state {
+ BROWSER_MOUSE_HOVER = 0, /* No mouse buttons pressed,
+ * May be used to indicate
+ * hover or end of drag. */
+
+ BROWSER_MOUSE_PRESS_1 = (1 << 0), /* button 1 pressed */
+ BROWSER_MOUSE_PRESS_2 = (1 << 1), /* button 2 pressed */
+
+ /* note: click meaning is different for
+ * different front ends. On RISC OS, it
+ * is standard to act on press, so a
+ * click is fired at the same time as a
+ * mouse button is pressed. With GTK, it
+ * is standard to act on release, so a
+ * click is fired when the mouse button
+ * is released, if the operation wasn't
+ * a drag. */
+
+ BROWSER_MOUSE_CLICK_1 = (1 << 2), /* button 1 clicked. */
+ BROWSER_MOUSE_CLICK_2 = (1 << 3), /* button 2 clicked. */
+
+ BROWSER_MOUSE_DOUBLE_CLICK = (1 << 4), /* button double clicked */
+ BROWSER_MOUSE_TRIPLE_CLICK = (1 << 5), /* button triple clicked */
+
+ /* note: double and triple clicks are
+ * fired alongside a
+ * BROWSER_MOUSE_CLICK_[1|2]
+ * to indicate which button
+ * is used.
+ */
+
+ BROWSER_MOUSE_DRAG_1 = (1 << 6), /* start of button 1 drag */
+ BROWSER_MOUSE_DRAG_2 = (1 << 7), /* start of button 2 drag */
+
+ BROWSER_MOUSE_DRAG_ON = (1 << 8), /* a drag operation was started
+ * and a mouse button is still
+ * pressed */
+
+ BROWSER_MOUSE_HOLDING_1 = (1 << 9), /* during button 1 drag */
+ BROWSER_MOUSE_HOLDING_2 = (1 << 10), /* during button 2 drag */
+
+
+ BROWSER_MOUSE_MOD_1 = (1 << 11), /* 1st modifier key pressed
+ * (eg. Shift) */
+ BROWSER_MOUSE_MOD_2 = (1 << 12), /* 2nd modifier key pressed
+ * (eg. Ctrl) */
+ BROWSER_MOUSE_MOD_3 = (1 << 13) /* 3rd modifier key pressed
+ * (eg. Alt) */
+} browser_mouse_state;
+
+
+typedef enum gui_pointer_shape {
+ GUI_POINTER_DEFAULT,
+ GUI_POINTER_POINT,
+ GUI_POINTER_CARET,
+ GUI_POINTER_MENU,
+ GUI_POINTER_UP,
+ GUI_POINTER_DOWN,
+ GUI_POINTER_LEFT,
+ GUI_POINTER_RIGHT,
+ GUI_POINTER_RU,
+ GUI_POINTER_LD,
+ GUI_POINTER_LU,
+ GUI_POINTER_RD,
+ GUI_POINTER_CROSS,
+ GUI_POINTER_MOVE,
+ GUI_POINTER_WAIT,
+ GUI_POINTER_HELP,
+ GUI_POINTER_NO_DROP,
+ GUI_POINTER_NOT_ALLOWED,
+ GUI_POINTER_PROGRESS
+} gui_pointer_shape;
+
+/** Mouse pointer type */
+typedef enum {
+ BROWSER_POINTER_DEFAULT = GUI_POINTER_DEFAULT,
+ BROWSER_POINTER_POINT = GUI_POINTER_POINT,
+ BROWSER_POINTER_CARET = GUI_POINTER_CARET,
+ BROWSER_POINTER_MENU = GUI_POINTER_MENU,
+ BROWSER_POINTER_UP = GUI_POINTER_UP,
+ BROWSER_POINTER_DOWN = GUI_POINTER_DOWN,
+ BROWSER_POINTER_LEFT = GUI_POINTER_LEFT,
+ BROWSER_POINTER_RIGHT = GUI_POINTER_RIGHT,
+ BROWSER_POINTER_RU = GUI_POINTER_RU,
+ BROWSER_POINTER_LD = GUI_POINTER_LD,
+ BROWSER_POINTER_LU = GUI_POINTER_LU,
+ BROWSER_POINTER_RD = GUI_POINTER_RD,
+ BROWSER_POINTER_CROSS = GUI_POINTER_CROSS,
+ BROWSER_POINTER_MOVE = GUI_POINTER_MOVE,
+ BROWSER_POINTER_WAIT = GUI_POINTER_WAIT,
+ BROWSER_POINTER_HELP = GUI_POINTER_HELP,
+ BROWSER_POINTER_NO_DROP = GUI_POINTER_NO_DROP,
+ BROWSER_POINTER_NOT_ALLOWED = GUI_POINTER_NOT_ALLOWED,
+ BROWSER_POINTER_PROGRESS = GUI_POINTER_PROGRESS,
+ BROWSER_POINTER_AUTO
+} browser_pointer_shape;
+
+
+void browser_mouse_state_dump(browser_mouse_state mouse);
+
+#endif
diff --git a/render/form.c b/render/form.c
index 71849c2..b3a8c51 100644
--- a/render/form.c
+++ b/render/form.c
@@ -44,7 +44,7 @@
#include "content/hlcache.h"
#include "content/handlers/css/utils.h"
#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/knockout.h"
#include "desktop/plot_style.h"
#include "desktop/plotters.h"
diff --git a/render/html.h b/render/html.h
index 215bfbb..2900e89 100644
--- a/render/html.h
+++ b/render/html.h
@@ -32,7 +32,7 @@
#include "content/content_type.h"
#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/plot_style.h"
#include "desktop/frame_types.h"
diff --git a/render/html_interaction.c b/render/html_interaction.c
index 0efb128..9513d0f 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -37,7 +37,7 @@
#include "content/hlcache.h"
#include "desktop/browser.h"
#include "desktop/frames.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "utils/nsoption.h"
#include "desktop/scrollbar.h"
#include "desktop/selection.h"
diff --git a/render/textplain.h b/render/textplain.h
index c3f2a0f..6a88c34 100644
--- a/render/textplain.h
+++ b/render/textplain.h
@@ -25,7 +25,7 @@
#define _NETSURF_RENDER_TEXTPLAIN_H_
#include <stddef.h>
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
struct content;
struct hlcache_handle;
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=a996bee9facdce826c5...
commit a996bee9facdce826c5fc3a819dd0ce362d80e95
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
fix test include path to account for public API headers
diff --git a/test/Makefile b/test/Makefile
index 95e7132..66b8aa7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -80,7 +80,7 @@ TESTCFLAGS := -std=c99 -g -Wall \
-D_BSD_SOURCE \
-D_POSIX_C_SOURCE=200809L \
-D_XOPEN_SOURCE=600 \
- -Itest -Ifrontends -I. -I.. \
+ -Itest -Iinclude -Ifrontends -I. -I.. \
-Dnsgtk \
$(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc libidn) \
$(LIB_CFLAGS) \
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=c041393e66b4a75cfc1...
commit c041393e66b4a75cfc1165e184be77cc974a63cb
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
move netsurf header into public API
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index a085c0c..cecbe6e 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -38,7 +38,7 @@
#include "netsurf/clipboard.h"
#include "netsurf/utf8.h"
#include "netsurf/layout.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
/**
* The global interface table.
@@ -743,7 +743,7 @@ static nserror verify_misc_register(struct gui_misc_table *gmt)
}
-/* exported interface documented in desktop/netsurf.h */
+/* exported interface documented in netsurf/netsurf.h */
nserror netsurf_register(struct netsurf_table *gt)
{
nserror err;
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 8e763ca..fd4cacf 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -49,7 +49,7 @@
#include "desktop/searchweb.h"
#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
/** speculative pre-conversion small image size
*
@@ -121,7 +121,7 @@ static nserror netsurf_llcache_query_handler(const llcache_query *query,
return NSERROR_OK;
}
-/* exported interface documented in desktop/netsurf.h */
+/* exported interface documented in netsurf/netsurf.h */
nserror netsurf_init(const char *store_path)
{
nserror ret;
diff --git a/desktop/netsurf.h b/desktop/netsurf.h
deleted file mode 100644
index ee6e53a..0000000
--- a/desktop/netsurf.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-/**
- * \file
- *
- * NetSurf core interface registration, construction and destruction.
- */
-
-#ifndef _NETSURF_DESKTOP_NETSURF_H_
-#define _NETSURF_DESKTOP_NETSURF_H_
-
-#include "utils/errors.h"
-#include "desktop/gui_table.h"
-
-/**
- * Register operation table.
- *
- * @param table NetSurf operations table.
- * @return NSERROR_OK on success or error code on faliure. On faliure
- * global table will not be initialised.
- */
-nserror netsurf_register(struct netsurf_table *table);
-
-/**
- * Initialise netsurf core.
- *
- * @param store_path path to persistant storage.
- * @return NSERROR_OK on success or error code on faliure.
- */
-nserror netsurf_init(const char *store_path);
-
-/**
- * Finalise NetSurf core
- */
-extern void netsurf_exit(void);
-
-#endif
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index c79e06b..ae70086 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -105,7 +105,7 @@
#include "desktop/browser.h"
#include "desktop/hotlist.h"
#include "desktop/mouse.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
#include "desktop/version.h"
#include "desktop/save_complete.h"
#include "desktop/scrollbar.h"
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 964983e..0e349ab 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -40,7 +40,7 @@
#include "netsurf/clipboard.h"
#include "netsurf/fetch.h"
#include "netsurf/misc.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
#include "atari/gemtk/gemtk.h"
#include "atari/gui.h"
diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp
index b30c896..58b9f9b 100644
--- a/frontends/beos/gui.cpp
+++ b/frontends/beos/gui.cpp
@@ -67,7 +67,7 @@ extern "C" {
#include "netsurf/clipboard.h"
#include "netsurf/search.h"
#include "netsurf/fetch.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
}
diff --git a/frontends/beos/scaffolding.cpp b/frontends/beos/scaffolding.cpp
index 9780884..82ae2af 100644
--- a/frontends/beos/scaffolding.cpp
+++ b/frontends/beos/scaffolding.cpp
@@ -55,7 +55,7 @@ extern "C" {
#include "content/content.h"
#include "desktop/browser_history.h"
#include "desktop/browser.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
#include "desktop/version.h"
#include "desktop/searchweb.h"
#include "desktop/search.h"
diff --git a/frontends/cocoa/NetsurfApp.m b/frontends/cocoa/NetsurfApp.m
index 6fb8560..f048ca6 100644
--- a/frontends/cocoa/NetsurfApp.m
+++ b/frontends/cocoa/NetsurfApp.m
@@ -39,7 +39,7 @@
#import "desktop/tree.h"
#import "render/html.h"
#import "desktop/mouse.h"
-#import "desktop/netsurf.h"
+#import "netsurf/netsurf.h"
#ifndef NETSURF_HOMEPAGE
#define NETSURF_HOMEPAGE "http://www.netsurf-browser.org/welcome/"
diff --git a/frontends/framebuffer/gui.c b/frontends/framebuffer/gui.c
index fc04ac8..6313481 100644
--- a/frontends/framebuffer/gui.c
+++ b/frontends/framebuffer/gui.c
@@ -40,7 +40,7 @@
#include "desktop/plotters.h"
#include "netsurf/window.h"
#include "netsurf/misc.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
#include "content/urldb.h"
#include "content/fetch.h"
diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index 7e23b6f..1201424 100644
--- a/frontends/gtk/gui.c
+++ b/frontends/gtk/gui.c
@@ -49,7 +49,7 @@
#include "desktop/textinput.h"
#include "desktop/tree.h"
#include "netsurf/misc.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
#include "gtk/compat.h"
#include "gtk/warn.h"
diff --git a/frontends/monkey/main.c b/frontends/monkey/main.c
index 6443dbd..756eadb 100644
--- a/frontends/monkey/main.c
+++ b/frontends/monkey/main.c
@@ -34,7 +34,7 @@
#include "content/fetchers/resource.h"
#include "content/hlcache.h"
#include "netsurf/misc.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
#include "monkey/dispatch.h"
#include "monkey/browser.h"
diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c
index 0a7120e..531b816 100644
--- a/frontends/riscos/gui.c
+++ b/frontends/riscos/gui.c
@@ -51,7 +51,7 @@
#include "netsurf/misc.h"
#include "desktop/save_complete.h"
#include "desktop/treeview.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
#include "desktop/browser.h"
#include "content/urldb.h"
#include "content/hlcache.h"
diff --git a/frontends/windows/main.c b/frontends/windows/main.c
index 3688851..c410de9 100644
--- a/frontends/windows/main.c
+++ b/frontends/windows/main.c
@@ -33,7 +33,7 @@
#include "desktop/browser.h"
#include "netsurf/fetch.h"
#include "netsurf/misc.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
#include "windows/findfile.h"
#include "windows/file.h"
diff --git a/include/netsurf/clipboard.h b/include/netsurf/clipboard.h
index 6feea24..d90ebc4 100644
--- a/include/netsurf/clipboard.h
+++ b/include/netsurf/clipboard.h
@@ -22,8 +22,8 @@
* Interface to platform-specific clipboard operations.
*/
-#ifndef _NETSURF_DESKTOP_GUI_CLIPBOARD_H_
-#define _NETSURF_DESKTOP_GUI_CLIPBOARD_H_
+#ifndef _NETSURF_CLIPBOARD_H_
+#define _NETSURF_CLIPBOARD_H_
#include <stddef.h>
diff --git a/include/netsurf/css.h b/include/netsurf/css.h
index bd95eae..3c7ae28 100644
--- a/include/netsurf/css.h
+++ b/include/netsurf/css.h
@@ -21,8 +21,8 @@
* Netsurf core css API
*/
-#ifndef NETSURF_CSS_H_
-#define NETSURF_CSS_H_
+#ifndef _NETSURF_CSS_H_
+#define _NETSURF_CSS_H_
/**
* Convert a CSS color to a NetSurf colour primitive
diff --git a/include/netsurf/download.h b/include/netsurf/download.h
index 55e115d..ae554db 100644
--- a/include/netsurf/download.h
+++ b/include/netsurf/download.h
@@ -22,8 +22,8 @@
* Interface to platform-specific download operations.
*/
-#ifndef _NETSURF_DESKTOP_GUI_DOWNLOAD_H_
-#define _NETSURF_DESKTOP_GUI_DOWNLOAD_H_
+#ifndef _NETSURF_DOWNLOAD_H_
+#define _NETSURF_DOWNLOAD_H_
struct gui_window;
struct download_context;
diff --git a/include/netsurf/fetch.h b/include/netsurf/fetch.h
index 22c5e6a..6e6d653 100644
--- a/include/netsurf/fetch.h
+++ b/include/netsurf/fetch.h
@@ -22,8 +22,8 @@
* Interface to platform-specific fetcher operations.
*/
-#ifndef _NETSURF_DESKTOP_GUI_FETCH_H_
-#define _NETSURF_DESKTOP_GUI_FETCH_H_
+#ifndef _NETSURF_FETCH_H_
+#define _NETSURF_FETCH_H_
struct nsurl;
diff --git a/include/netsurf/layout.h b/include/netsurf/layout.h
index 1696aee..266de40 100644
--- a/include/netsurf/layout.h
+++ b/include/netsurf/layout.h
@@ -29,8 +29,8 @@
* is the correct approach.
*/
-#ifndef _NETSURF_DESKTOP_GUI_LAYOUT_H_
-#define _NETSURF_DESKTOP_GUI_LAYOUT_H_
+#ifndef _NETSURF_LAYOUT_H_
+#define _NETSURF_LAYOUT_H_
struct plot_font_style;
diff --git a/include/netsurf/misc.h b/include/netsurf/misc.h
index 399d938..7b35495 100644
--- a/include/netsurf/misc.h
+++ b/include/netsurf/misc.h
@@ -22,8 +22,8 @@
* Interface to platform-specific miscellaneous browser operation table.
*/
-#ifndef _NETSURF_DESKTOP_GUI_MISC_H_
-#define _NETSURF_DESKTOP_GUI_MISC_H_
+#ifndef _NETSURF_MISC_H_
+#define _NETSURF_MISC_H_
struct form_control;
struct gui_window;
diff --git a/include/netsurf/netsurf.h b/include/netsurf/netsurf.h
new file mode 100644
index 0000000..9c9d2b4
--- /dev/null
+++ b/include/netsurf/netsurf.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+/**
+ * \file
+ *
+ * NetSurf core interface registration, construction and destruction.
+ */
+
+#ifndef _NETSURF_NETSURF_H_
+#define _NETSURF_NETSURF_H_
+
+#include "utils/errors.h"
+#include "desktop/gui_table.h"
+
+/**
+ * Register operation table.
+ *
+ * @param table NetSurf operations table.
+ * @return NSERROR_OK on success or error code on faliure. On faliure
+ * global table will not be initialised.
+ */
+nserror netsurf_register(struct netsurf_table *table);
+
+/**
+ * Initialise netsurf core.
+ *
+ * @param store_path path to persistant storage.
+ * @return NSERROR_OK on success or error code on faliure.
+ */
+nserror netsurf_init(const char *store_path);
+
+/**
+ * Finalise NetSurf core
+ */
+extern void netsurf_exit(void);
+
+#endif
diff --git a/include/netsurf/search.h b/include/netsurf/search.h
index 0b02ac8..1246ea9 100644
--- a/include/netsurf/search.h
+++ b/include/netsurf/search.h
@@ -22,8 +22,8 @@
* Interface to platform-specific search operations.
*/
-#ifndef _NETSURF_DESKTOP_GUI_SEARCH_H_
-#define _NETSURF_DESKTOP_GUI_SEARCH_H_
+#ifndef _NETSURF_SEARCH_H_
+#define _NETSURF_SEARCH_H_
/**
* function table for page text search.
diff --git a/include/netsurf/utf8.h b/include/netsurf/utf8.h
index c40c4c1..04499e5 100644
--- a/include/netsurf/utf8.h
+++ b/include/netsurf/utf8.h
@@ -22,8 +22,8 @@
* Interface to platform-specific utf8 operations.
*/
-#ifndef _NETSURF_DESKTOP_GUI_UTF8_H_
-#define _NETSURF_DESKTOP_GUI_UTF8_H_
+#ifndef _NETSURF_UTF8_H_
+#define _NETSURF_UTF8_H_
/**
* User interface utf8 characterset conversion routines.
diff --git a/include/netsurf/window.h b/include/netsurf/window.h
index 7ecd3c2..8b3e9c4 100644
--- a/include/netsurf/window.h
+++ b/include/netsurf/window.h
@@ -23,8 +23,8 @@
* operations.
*/
-#ifndef _NETSURF_DESKTOP_GUI_WINDOW_H_
-#define _NETSURF_DESKTOP_GUI_WINDOW_H_
+#ifndef _NETSURF_WINDOW_H_
+#define _NETSURF_WINDOW_H_
typedef enum gui_save_type {
GUI_SAVE_SOURCE,
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=9ce71876ce500e242e2...
commit 9ce71876ce500e242e2384c21abb38a8f431138b
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
move layout header into public API
diff --git a/desktop/browser_history.c b/desktop/browser_history.c
index 871cc3e..79a921a 100644
--- a/desktop/browser_history.c
+++ b/desktop/browser_history.c
@@ -36,7 +36,7 @@
#include "content/urldb.h"
#include "netsurf/bitmap.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "desktop/gui_internal.h"
#include "desktop/browser_history.h"
#include "desktop/browser_private.h"
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index e2549cc..a085c0c 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -37,7 +37,7 @@
#include "netsurf/search.h"
#include "netsurf/clipboard.h"
#include "netsurf/utf8.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "desktop/netsurf.h"
/**
diff --git a/desktop/gui_layout.h b/desktop/gui_layout.h
deleted file mode 100644
index 1696aee..0000000
--- a/desktop/gui_layout.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2016 Vincent Sanders <vince(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-/**
- * \file
- *
- * Interface to platform-specific layout operation table.
- *
- * This table is part of the layout used to measure glyphs before
- * rendering, previously referred to as font functions.
- *
- * \note This is an old interface within the browser, it has been
- * broken out purely to make the API obvious not as an indication this
- * is the correct approach.
- */
-
-#ifndef _NETSURF_DESKTOP_GUI_LAYOUT_H_
-#define _NETSURF_DESKTOP_GUI_LAYOUT_H_
-
-struct plot_font_style;
-
-struct gui_layout_table
-{
- /**
- * Measure the width of a string.
- *
- * \param[in] fstyle plot style for this text
- * \param[in] string UTF-8 string to measure
- * \param[in] length length of string, in bytes
- * \param[out] width updated to width of string[0..length)
- * \return NSERROR_OK and width updated or appropriate error
- * code on faliure
- */
- nserror (*width)(const struct plot_font_style *fstyle, const char *string, size_t length, int *width);
-
-
- /**
- * Find the position in a string where an x coordinate falls.
- *
- * \param[in] fstyle style for this text
- * \param[in] string UTF-8 string to measure
- * \param[in] length length of string, in bytes
- * \param[in] x coordinate to search for
- * \param[out] char_offset updated to offset in string of actual_x, [0..length]
- * \param[out] actual_x updated to x coordinate of character closest to x
- * \return NSERROR_OK and char_offset and actual_x updated or appropriate error code on faliure
- */
- nserror (*position)(const struct plot_font_style *fstyle, const char *string, size_t length, int x, size_t *char_offset, int *actual_x);
-
-
- /**
- * Find where to split a string to make it fit a width.
- *
- * \param[in] fstyle style for this text
- * \param[in] string UTF-8 string to measure
- * \param[in] length length of string, in bytes
- * \param[in] x width available
- * \param[out] char_offset updated to offset in string of actual_x, [1..length]
- * \param[out] actual_x updated to x coordinate of character closest to x
- * \return NSERROR_OK or appropriate error code on faliure
- *
- * On exit, char_offset indicates first character after split point.
- *
- * \note char_offset of 0 must never be returned.
- *
- * Returns:
- * char_offset giving split point closest to x, where actual_x <= x
- * else
- * char_offset giving split point closest to x, where actual_x > x
- *
- * Returning char_offset == length means no split possible
- */
- nserror (*split)(const struct plot_font_style *fstyle, const char *string, size_t length, int x, size_t *char_offset, int *actual_x);
-};
-
-#endif
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 833815e..157d6c1 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -38,7 +38,7 @@
#include "desktop/plotters.h"
#include "desktop/scrollbar.h"
#include "netsurf/clipboard.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "desktop/gui_internal.h"
#define CARET_COLOR 0x0000FF
diff --git a/desktop/treeview.c b/desktop/treeview.c
index d72bf2f..ead0510 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -33,7 +33,7 @@
#include "desktop/textarea.h"
#include "desktop/treeview.h"
#include "netsurf/clipboard.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "desktop/gui_internal.h"
/** @todo get rid of REDRAW_MAX -- need to be able to know window size */
diff --git a/frontends/amiga/font.c b/frontends/amiga/font.c
index 1c9702a..af62652 100644
--- a/frontends/amiga/font.c
+++ b/frontends/amiga/font.c
@@ -25,7 +25,7 @@
#include "utils/log.h"
#include "utils/nsoption.h"
#include "desktop/browser.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "amiga/font.h"
#include "amiga/font_bullet.h"
diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c
index ef70fe7..573daf3 100644
--- a/frontends/amiga/print.c
+++ b/frontends/amiga/print.c
@@ -52,7 +52,7 @@
#include "desktop/plotters.h"
#include "desktop/printer.h"
#include "desktop/print.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "desktop/mouse.h"
#include "netsurf/window.h"
#include "content/hlcache.h"
diff --git a/frontends/atari/font.c b/frontends/atari/font.c
index cb0c574..f6b91c8 100644
--- a/frontends/atari/font.c
+++ b/frontends/atari/font.c
@@ -24,7 +24,7 @@
#include "utils/utf8.h"
#include "utils/log.h"
#include "utils/nsoption.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "desktop/mouse.h"
#include "desktop/plotters.h"
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 39edeb4..964983e 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -35,7 +35,7 @@
#include "content/hlcache.h"
#include "desktop/treeview.h"
#include "desktop/browser.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "netsurf/window.h"
#include "netsurf/clipboard.h"
#include "netsurf/fetch.h"
diff --git a/frontends/beos/font.cpp b/frontends/beos/font.cpp
index 003af52..407918f 100644
--- a/frontends/beos/font.cpp
+++ b/frontends/beos/font.cpp
@@ -36,7 +36,7 @@ extern "C" {
#include "utils/log.h"
#include "utils/nsoption.h"
#include "utils/nsurl.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
}
#include "beos/gui.h"
diff --git a/frontends/cocoa/font.m b/frontends/cocoa/font.m
index f52ec85..7b594b6 100644
--- a/frontends/cocoa/font.m
+++ b/frontends/cocoa/font.m
@@ -22,7 +22,7 @@
#import "cocoa/font.h"
#import "utils/nsoption.h"
-#import "desktop/gui_layout.h"
+#import "netsurf/layout.h"
#import "desktop/plotters.h"
diff --git a/frontends/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c
index d1ac9ed..bf96cab 100644
--- a/frontends/framebuffer/font_freetype.c
+++ b/frontends/framebuffer/font_freetype.c
@@ -28,7 +28,7 @@
#include "utils/log.h"
#include "utils/nsoption.h"
#include "netsurf/utf8.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "desktop/browser.h"
#include "framebuffer/gui.h"
diff --git a/frontends/framebuffer/font_internal.c b/frontends/framebuffer/font_internal.c
index 9b15858..9164a29 100644
--- a/frontends/framebuffer/font_internal.c
+++ b/frontends/framebuffer/font_internal.c
@@ -25,7 +25,7 @@
#include "utils/nsoption.h"
#include "utils/utf8.h"
#include "netsurf/utf8.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "framebuffer/gui.h"
#include "framebuffer/font.h"
diff --git a/frontends/gtk/layout_pango.c b/frontends/gtk/layout_pango.c
index 49b6293..a0196df 100644
--- a/frontends/gtk/layout_pango.c
+++ b/frontends/gtk/layout_pango.c
@@ -30,7 +30,7 @@
#include "utils/log.h"
#include "utils/nsoption.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "gtk/layout_pango.h"
#include "gtk/plotters.h"
diff --git a/frontends/monkey/layout.c b/frontends/monkey/layout.c
index 401ca15..00ed9df 100644
--- a/frontends/monkey/layout.c
+++ b/frontends/monkey/layout.c
@@ -25,7 +25,7 @@
#include "utils/utf8.h"
#include "desktop/plot_style.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "monkey/layout.h"
diff --git a/frontends/riscos/font.c b/frontends/riscos/font.c
index 2f2ba9a..a7a394e 100644
--- a/frontends/riscos/font.c
+++ b/frontends/riscos/font.c
@@ -34,7 +34,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "riscos/gui.h"
#include "riscos/font.h"
diff --git a/frontends/windows/font.c b/frontends/windows/font.c
index 8af7ea6..551a0eb 100644
--- a/frontends/windows/font.c
+++ b/frontends/windows/font.c
@@ -30,7 +30,7 @@
#include "utils/log.h"
#include "utils/nsoption.h"
#include "utils/utf8.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "netsurf/utf8.h"
#include "windows/font.h"
diff --git a/include/netsurf/layout.h b/include/netsurf/layout.h
new file mode 100644
index 0000000..1696aee
--- /dev/null
+++ b/include/netsurf/layout.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2016 Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+/**
+ * \file
+ *
+ * Interface to platform-specific layout operation table.
+ *
+ * This table is part of the layout used to measure glyphs before
+ * rendering, previously referred to as font functions.
+ *
+ * \note This is an old interface within the browser, it has been
+ * broken out purely to make the API obvious not as an indication this
+ * is the correct approach.
+ */
+
+#ifndef _NETSURF_DESKTOP_GUI_LAYOUT_H_
+#define _NETSURF_DESKTOP_GUI_LAYOUT_H_
+
+struct plot_font_style;
+
+struct gui_layout_table
+{
+ /**
+ * Measure the width of a string.
+ *
+ * \param[in] fstyle plot style for this text
+ * \param[in] string UTF-8 string to measure
+ * \param[in] length length of string, in bytes
+ * \param[out] width updated to width of string[0..length)
+ * \return NSERROR_OK and width updated or appropriate error
+ * code on faliure
+ */
+ nserror (*width)(const struct plot_font_style *fstyle, const char *string, size_t length, int *width);
+
+
+ /**
+ * Find the position in a string where an x coordinate falls.
+ *
+ * \param[in] fstyle style for this text
+ * \param[in] string UTF-8 string to measure
+ * \param[in] length length of string, in bytes
+ * \param[in] x coordinate to search for
+ * \param[out] char_offset updated to offset in string of actual_x, [0..length]
+ * \param[out] actual_x updated to x coordinate of character closest to x
+ * \return NSERROR_OK and char_offset and actual_x updated or appropriate error code on faliure
+ */
+ nserror (*position)(const struct plot_font_style *fstyle, const char *string, size_t length, int x, size_t *char_offset, int *actual_x);
+
+
+ /**
+ * Find where to split a string to make it fit a width.
+ *
+ * \param[in] fstyle style for this text
+ * \param[in] string UTF-8 string to measure
+ * \param[in] length length of string, in bytes
+ * \param[in] x width available
+ * \param[out] char_offset updated to offset in string of actual_x, [1..length]
+ * \param[out] actual_x updated to x coordinate of character closest to x
+ * \return NSERROR_OK or appropriate error code on faliure
+ *
+ * On exit, char_offset indicates first character after split point.
+ *
+ * \note char_offset of 0 must never be returned.
+ *
+ * Returns:
+ * char_offset giving split point closest to x, where actual_x <= x
+ * else
+ * char_offset giving split point closest to x, where actual_x > x
+ *
+ * Returning char_offset == length means no split possible
+ */
+ nserror (*split)(const struct plot_font_style *fstyle, const char *string, size_t length, int x, size_t *char_offset, int *actual_x);
+};
+
+#endif
diff --git a/render/html.c b/render/html.c
index 6120fdf..8307cdc 100644
--- a/render/html.c
+++ b/render/html.c
@@ -50,7 +50,7 @@
#include "javascript/js.h"
#include "desktop/browser.h"
#include "netsurf/utf8.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
diff --git a/render/html_interaction.c b/render/html_interaction.c
index 4d0a903..0efb128 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -45,7 +45,7 @@
#include "desktop/textinput.h"
#include "javascript/js.h"
#include "netsurf/misc.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
diff --git a/render/html_redraw.c b/render/html_redraw.c
index cf4bd6f..e70f9be 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -49,7 +49,7 @@
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
#include "netsurf/bitmap.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
diff --git a/render/layout.c b/render/layout.c
index a7f2e8d..c86ccd7 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -52,7 +52,7 @@
#include "desktop/browser.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "render/box.h"
#include "render/font.h"
diff --git a/render/textplain.c b/render/textplain.c
index 5ecf143..9fe560d 100644
--- a/render/textplain.c
+++ b/render/textplain.c
@@ -46,7 +46,7 @@
#include "desktop/search.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "desktop/gui_internal.h"
#include "render/search.h"
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=527756cca0471a55389...
commit 527756cca0471a55389a3494d35f9b1b13f20b7e
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
move fetch header into public API
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index 1a42134..9ac390c 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -52,7 +52,7 @@
#include "utils/useragent.h"
#include "utils/file.h"
#include "utils/string.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
diff --git a/content/fetchers/file.c b/content/fetchers/file.c
index 8cfe3a0..04184d2 100644
--- a/content/fetchers/file.c
+++ b/content/fetchers/file.c
@@ -49,7 +49,7 @@
#include "utils/utils.h"
#include "utils/ring.h"
#include "utils/file.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "desktop/gui_internal.h"
#include "content/dirlist.h"
diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c
index 72ed887..21ad8c7 100644
--- a/content/fetchers/resource.c
+++ b/content/fetchers/resource.c
@@ -35,7 +35,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "utils/ring.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "desktop/gui_internal.h"
#include "content/fetch.h"
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index c1a0610..e2549cc 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -31,7 +31,7 @@
#include "desktop/download.h"
#include "desktop/searchweb.h"
#include "netsurf/download.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "netsurf/misc.h"
#include "netsurf/window.h"
#include "netsurf/search.h"
diff --git a/desktop/gui_fetch.h b/desktop/gui_fetch.h
deleted file mode 100644
index 22c5e6a..0000000
--- a/desktop/gui_fetch.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-/**
- * \file
- *
- * Interface to platform-specific fetcher operations.
- */
-
-#ifndef _NETSURF_DESKTOP_GUI_FETCH_H_
-#define _NETSURF_DESKTOP_GUI_FETCH_H_
-
-struct nsurl;
-
-/**
- * function table for fetcher operations.
- */
-struct gui_fetch_table {
- /* Mandantory entries */
-
- /**
- * Determine the MIME type of a local file.
- *
- * @note used in file fetcher
- *
- * \param unix_path Unix style path to file on disk
- * \return Pointer to MIME type string (should not be freed) -
- * invalidated on next call to fetch_filetype.
- */
- const char *(*filetype)(const char *unix_path);
-
- /* Optional entries */
-
- /**
- * Translate resource to full url.
- *
- * @note Only used in resource fetcher
- *
- * Transforms a resource: path into a full URL. The returned URL
- * is used as the target for a redirect. The caller takes ownership of
- * the returned nsurl including unrefing it when finished with it.
- *
- * \param path The path of the resource to locate.
- * \return A string containing the full URL of the target object or
- * NULL if no suitable resource can be found.
- */
- struct nsurl* (*get_resource_url)(const char *path);
-
- /**
- * Translate resource to source data.
- *
- * @note Only used in resource fetcher
- *
- * Obtains the data for a resource directly
- *
- * \param path The path of the resource to locate.
- * \param data Pointer to recive data into
- * \param data_len Pointer to length of returned data
- * \return NSERROR_OK and the data and length values updated
- * else appropriate error code.
- */
- nserror (*get_resource_data)(const char *path, const uint8_t **data, size_t *data_len);
-
- /**
- * Releases source data.
- *
- * @note Only used in resource fetcher
- *
- * Releases source data obtained from get_resource_data()
- *
- * \param data The value returned from a previous get_resource_data call
- * \return NSERROR_OK on success else appropriate error code.
- */
- nserror (*release_resource_data)(const uint8_t *data);
-
- /**
- * Find a MIME type for a local file
- *
- * @note only used in curl fetcher in form file controls on
- * RISC OS otherwise its a strdup of a filetype call.
- *
- * \param ro_path RISC OS style path to file on disk
- * \return MIME type string (on heap, caller should free), or NULL
- */
- char *(*mimetype)(const char *ro_path);
-
-};
-
-#endif
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 75875d3..c79e06b 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -113,7 +113,7 @@
#include "desktop/textinput.h"
#include "desktop/tree.h"
#include "netsurf/window.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "netsurf/misc.h"
/* NetSurf Amiga platform includes */
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 21fe4ec..39edeb4 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -38,7 +38,7 @@
#include "desktop/gui_layout.h"
#include "netsurf/window.h"
#include "netsurf/clipboard.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "netsurf/misc.h"
#include "desktop/netsurf.h"
diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp
index 3a45c66..b30c896 100644
--- a/frontends/beos/gui.cpp
+++ b/frontends/beos/gui.cpp
@@ -66,7 +66,7 @@ extern "C" {
#include "netsurf/misc.h"
#include "netsurf/clipboard.h"
#include "netsurf/search.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "desktop/netsurf.h"
}
diff --git a/frontends/cocoa/fetch.m b/frontends/cocoa/fetch.m
index 1c36bb8..0bbce09 100644
--- a/frontends/cocoa/fetch.m
+++ b/frontends/cocoa/fetch.m
@@ -20,7 +20,7 @@
#import "utils/log.h"
#import "utils/nsurl.h"
-#import "desktop/gui_fetch.h"
+#import "netsurf/fetch.h"
#import "cocoa/fetch.h"
diff --git a/frontends/framebuffer/fetch.c b/frontends/framebuffer/fetch.c
index 24920fb..e6b72e0 100644
--- a/frontends/framebuffer/fetch.c
+++ b/frontends/framebuffer/fetch.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "utils/filepath.h"
#include "utils/file.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "framebuffer/findfile.h"
#include "framebuffer/fetch.h"
diff --git a/frontends/gtk/fetch.c b/frontends/gtk/fetch.c
index 06770b6..1f397e1 100644
--- a/frontends/gtk/fetch.c
+++ b/frontends/gtk/fetch.c
@@ -32,7 +32,7 @@
#include "utils/filepath.h"
#include "utils/file.h"
#include "utils/nsurl.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "gtk/gui.h"
#include "gtk/resources.h"
diff --git a/frontends/monkey/fetch.c b/frontends/monkey/fetch.c
index 86732cf..4985329 100644
--- a/frontends/monkey/fetch.c
+++ b/frontends/monkey/fetch.c
@@ -26,7 +26,7 @@
#include "utils/file.h"
#include "utils/nsurl.h"
#include "utils/filepath.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "monkey/filetype.h"
#include "monkey/fetch.h"
diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c
index 79d89e2..0a7120e 100644
--- a/frontends/riscos/gui.c
+++ b/frontends/riscos/gui.c
@@ -47,7 +47,7 @@
#include "utils/filename.h"
#include "utils/url.h"
#include "utils/corestrings.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "netsurf/misc.h"
#include "desktop/save_complete.h"
#include "desktop/treeview.h"
diff --git a/frontends/windows/filetype.c b/frontends/windows/filetype.c
index b06534d..aab27ea 100644
--- a/frontends/windows/filetype.c
+++ b/frontends/windows/filetype.c
@@ -22,7 +22,7 @@
#include "utils/log.h"
#include "utils/utils.h"
#include "content/fetch.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "windows/filetype.h"
diff --git a/frontends/windows/main.c b/frontends/windows/main.c
index a8ad9e8..3688851 100644
--- a/frontends/windows/main.c
+++ b/frontends/windows/main.c
@@ -31,7 +31,7 @@
#include "utils/nsurl.h"
#include "utils/nsoption.h"
#include "desktop/browser.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "netsurf/misc.h"
#include "desktop/netsurf.h"
diff --git a/include/netsurf/fetch.h b/include/netsurf/fetch.h
new file mode 100644
index 0000000..22c5e6a
--- /dev/null
+++ b/include/netsurf/fetch.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+/**
+ * \file
+ *
+ * Interface to platform-specific fetcher operations.
+ */
+
+#ifndef _NETSURF_DESKTOP_GUI_FETCH_H_
+#define _NETSURF_DESKTOP_GUI_FETCH_H_
+
+struct nsurl;
+
+/**
+ * function table for fetcher operations.
+ */
+struct gui_fetch_table {
+ /* Mandantory entries */
+
+ /**
+ * Determine the MIME type of a local file.
+ *
+ * @note used in file fetcher
+ *
+ * \param unix_path Unix style path to file on disk
+ * \return Pointer to MIME type string (should not be freed) -
+ * invalidated on next call to fetch_filetype.
+ */
+ const char *(*filetype)(const char *unix_path);
+
+ /* Optional entries */
+
+ /**
+ * Translate resource to full url.
+ *
+ * @note Only used in resource fetcher
+ *
+ * Transforms a resource: path into a full URL. The returned URL
+ * is used as the target for a redirect. The caller takes ownership of
+ * the returned nsurl including unrefing it when finished with it.
+ *
+ * \param path The path of the resource to locate.
+ * \return A string containing the full URL of the target object or
+ * NULL if no suitable resource can be found.
+ */
+ struct nsurl* (*get_resource_url)(const char *path);
+
+ /**
+ * Translate resource to source data.
+ *
+ * @note Only used in resource fetcher
+ *
+ * Obtains the data for a resource directly
+ *
+ * \param path The path of the resource to locate.
+ * \param data Pointer to recive data into
+ * \param data_len Pointer to length of returned data
+ * \return NSERROR_OK and the data and length values updated
+ * else appropriate error code.
+ */
+ nserror (*get_resource_data)(const char *path, const uint8_t **data, size_t *data_len);
+
+ /**
+ * Releases source data.
+ *
+ * @note Only used in resource fetcher
+ *
+ * Releases source data obtained from get_resource_data()
+ *
+ * \param data The value returned from a previous get_resource_data call
+ * \return NSERROR_OK on success else appropriate error code.
+ */
+ nserror (*release_resource_data)(const uint8_t *data);
+
+ /**
+ * Find a MIME type for a local file
+ *
+ * @note only used in curl fetcher in form file controls on
+ * RISC OS otherwise its a strdup of a filetype call.
+ *
+ * \param ro_path RISC OS style path to file on disk
+ * \return MIME type string (on heap, caller should free), or NULL
+ */
+ char *(*mimetype)(const char *ro_path);
+
+};
+
+#endif
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=fe7eb85614244d5e065...
commit fe7eb85614244d5e0659c88431fbd9726fa33051
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
move misc header into public API
diff --git a/content/fetch.c b/content/fetch.c
index 9c2933b..c5928ba 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -49,7 +49,7 @@
#include "utils/nsurl.h"
#include "utils/utils.h"
#include "utils/ring.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "content/fetch.h"
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index b94a3f2..1a42134 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -53,7 +53,7 @@
#include "utils/file.h"
#include "utils/string.h"
#include "desktop/gui_fetch.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "content/fetch.h"
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index 0c76596..7d8ac4b 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -50,7 +50,7 @@
#include "utils/utils.h"
#include "utils/messages.h"
#include "desktop/gui_internal.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "content/backing_store.h"
diff --git a/content/handlers/image/gif.c b/content/handlers/image/gif.c
index 1167266..93970f9 100644
--- a/content/handlers/image/gif.c
+++ b/content/handlers/image/gif.c
@@ -40,7 +40,7 @@
#include "utils/messages.h"
#include "utils/nsoption.h"
#include "content/content_protected.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "netsurf/bitmap.h"
diff --git a/content/handlers/image/image_cache.c b/content/handlers/image/image_cache.c
index 52b3b34..4c008b7 100644
--- a/content/handlers/image/image_cache.c
+++ b/content/handlers/image/image_cache.c
@@ -26,7 +26,7 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "content/content_protected.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "netsurf/bitmap.h"
diff --git a/content/hlcache.c b/content/hlcache.c
index 06d9f6d..65210d5 100644
--- a/content/hlcache.c
+++ b/content/hlcache.c
@@ -29,7 +29,7 @@
#include "utils/messages.h"
#include "utils/ring.h"
#include "utils/utils.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "content/content.h"
diff --git a/content/llcache.c b/content/llcache.c
index 9381ce9..33a9b98 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -47,7 +47,7 @@
#include "utils/nsurl.h"
#include "utils/utils.h"
#include "utils/time.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "content/fetch.h"
diff --git a/desktop/browser.c b/desktop/browser.c
index bb39ee3..f69acc5 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -70,7 +70,7 @@
#include "desktop/selection.h"
#include "desktop/plotters.h"
#include "desktop/theme.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "netsurf/window.h"
#include "desktop/gui_internal.h"
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index db675a7..c1a0610 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -32,7 +32,7 @@
#include "desktop/searchweb.h"
#include "netsurf/download.h"
#include "desktop/gui_fetch.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "netsurf/window.h"
#include "netsurf/search.h"
#include "netsurf/clipboard.h"
diff --git a/desktop/gui_misc.h b/desktop/gui_misc.h
deleted file mode 100644
index 399d938..0000000
--- a/desktop/gui_misc.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-/**
- * \file
- *
- * Interface to platform-specific miscellaneous browser operation table.
- */
-
-#ifndef _NETSURF_DESKTOP_GUI_MISC_H_
-#define _NETSURF_DESKTOP_GUI_MISC_H_
-
-struct form_control;
-struct gui_window;
-struct ssl_cert_info;
-struct nsurl;
-
-/**
- * Graphical user interface browser misc function table.
- *
- * function table implementing GUI interface to miscelaneous browser
- * functionality
- */
-struct gui_misc_table {
- /* Mandantory entries */
-
- /**
- * Schedule a callback.
- *
- * \param t interval before the callback should be made in ms or
- * negative value to remove any existing callback.
- * \param callback callback function
- * \param p user parameter passed to callback function
- * \return NSERROR_OK on sucess or appropriate error on faliure
- *
- * The callback function will be called as soon as possible
- * after the timeout has elapsed.
- *
- * Additional calls with the same callback and user parameter will
- * reset the callback time to the newly specified value.
- *
- */
- nserror (*schedule)(int t, void (*callback)(void *p), void *p);
-
- /**
- * Warn the user of an event.
- *
- * \param[in] message A warning looked up in the message
- * translation table
- * \param[in] detail Additional text to be displayed or NULL.
- * \return NSERROR_OK on success or error code if there was a
- * faliure displaying the message to the user.
- */
- nserror (*warning)(const char *message, const char *detail);
-
-
- /* Optional entries */
-
- /**
- * called to allow the gui to cleanup.
- */
- void (*quit)(void);
-
- /**
- * core has no fetcher for url
- */
- nserror (*launch_url)(struct nsurl *url);
-
- /**
- * Prompt the user to verify a certificate with issuse.
- *
- * \param url The URL being verified.
- * \param certs The certificate to be verified
- * \param num The number of certificates to be verified.
- * \param cb Callback upon user decision.
- * \param cbpw Context pointer passed to cb
- */
- void (*cert_verify)(struct nsurl *url, const struct ssl_cert_info *certs, unsigned long num, nserror (*cb)(bool proceed, void *pw), void *cbpw);
-
- /**
- * Prompt user for login
- */
- void (*login)(struct nsurl *url, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw);
-
- /**
- * Prompt the user for a password for a PDF.
- */
- void (*pdf_password)(char **owner_pass, char **user_pass, char *path);
-
-};
-
-#endif
diff --git a/desktop/hotlist.c b/desktop/hotlist.c
index 98d5f9c..f9a1f41 100644
--- a/desktop/hotlist.c
+++ b/desktop/hotlist.c
@@ -33,7 +33,7 @@
#include "utils/log.h"
#include "content/urldb.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "desktop/hotlist.h"
#include "desktop/treeview.h"
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index d3d45ca..8e763ca 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -47,7 +47,7 @@
#include "desktop/browser.h"
#include "desktop/system_colour.h"
#include "desktop/searchweb.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "desktop/netsurf.h"
diff --git a/desktop/save_complete.c b/desktop/save_complete.c
index 6f63960..201e80b 100644
--- a/desktop/save_complete.c
+++ b/desktop/save_complete.c
@@ -45,7 +45,7 @@
#include "render/box.h"
#include "render/html.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "desktop/save_complete.h"
diff --git a/desktop/tree.c b/desktop/tree.c
index e9a2dfd..91fd0b9 100644
--- a/desktop/tree.c
+++ b/desktop/tree.c
@@ -44,7 +44,7 @@ struct tree {
void *client_data; /* User assigned data for the callbacks */
};
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "desktop/treeview.h"
#include "desktop/hotlist.h"
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 88a06c6..75875d3 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -114,7 +114,7 @@
#include "desktop/tree.h"
#include "netsurf/window.h"
#include "desktop/gui_fetch.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
/* NetSurf Amiga platform includes */
#include "amiga/gui.h"
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 5107f83..21fe4ec 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -39,7 +39,7 @@
#include "netsurf/window.h"
#include "netsurf/clipboard.h"
#include "desktop/gui_fetch.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/netsurf.h"
#include "atari/gemtk/gemtk.h"
diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp
index 645d7d6..3a45c66 100644
--- a/frontends/beos/gui.cpp
+++ b/frontends/beos/gui.cpp
@@ -63,7 +63,7 @@ extern "C" {
#include "content/hlcache.h"
#include "content/urldb.h"
#include "desktop/browser.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "netsurf/clipboard.h"
#include "netsurf/search.h"
#include "desktop/gui_fetch.h"
diff --git a/frontends/cocoa/gui.m b/frontends/cocoa/gui.m
index 326e286..787fb68 100644
--- a/frontends/cocoa/gui.m
+++ b/frontends/cocoa/gui.m
@@ -23,7 +23,7 @@
#import "utils/log.h"
#import "desktop/mouse.h"
#import "netsurf/window.h"
-#import "desktop/gui_misc.h"
+#import "netsurf/misc.h"
#import "desktop/browser.h"
#import "desktop/textinput.h"
#import "content/handlers/image/ico.h"
diff --git a/frontends/framebuffer/gui.c b/frontends/framebuffer/gui.c
index 4a8b7a6..fc04ac8 100644
--- a/frontends/framebuffer/gui.c
+++ b/frontends/framebuffer/gui.c
@@ -39,7 +39,7 @@
#include "desktop/browser_history.h"
#include "desktop/plotters.h"
#include "netsurf/window.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/netsurf.h"
#include "content/urldb.h"
#include "content/fetch.h"
diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index 6430f9d..7e23b6f 100644
--- a/frontends/gtk/gui.c
+++ b/frontends/gtk/gui.c
@@ -48,7 +48,7 @@
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/netsurf.h"
#include "gtk/compat.h"
diff --git a/frontends/monkey/main.c b/frontends/monkey/main.c
index ff70bda..6443dbd 100644
--- a/frontends/monkey/main.c
+++ b/frontends/monkey/main.c
@@ -33,7 +33,7 @@
#include "content/fetchers.h"
#include "content/fetchers/resource.h"
#include "content/hlcache.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/netsurf.h"
#include "monkey/dispatch.h"
diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c
index 309f27b..79d89e2 100644
--- a/frontends/riscos/gui.c
+++ b/frontends/riscos/gui.c
@@ -48,7 +48,7 @@
#include "utils/url.h"
#include "utils/corestrings.h"
#include "desktop/gui_fetch.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/save_complete.h"
#include "desktop/treeview.h"
#include "desktop/netsurf.h"
diff --git a/frontends/windows/main.c b/frontends/windows/main.c
index df64e48..a8ad9e8 100644
--- a/frontends/windows/main.c
+++ b/frontends/windows/main.c
@@ -32,7 +32,7 @@
#include "utils/nsoption.h"
#include "desktop/browser.h"
#include "desktop/gui_fetch.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/netsurf.h"
#include "windows/findfile.h"
diff --git a/include/netsurf/misc.h b/include/netsurf/misc.h
new file mode 100644
index 0000000..399d938
--- /dev/null
+++ b/include/netsurf/misc.h
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+/**
+ * \file
+ *
+ * Interface to platform-specific miscellaneous browser operation table.
+ */
+
+#ifndef _NETSURF_DESKTOP_GUI_MISC_H_
+#define _NETSURF_DESKTOP_GUI_MISC_H_
+
+struct form_control;
+struct gui_window;
+struct ssl_cert_info;
+struct nsurl;
+
+/**
+ * Graphical user interface browser misc function table.
+ *
+ * function table implementing GUI interface to miscelaneous browser
+ * functionality
+ */
+struct gui_misc_table {
+ /* Mandantory entries */
+
+ /**
+ * Schedule a callback.
+ *
+ * \param t interval before the callback should be made in ms or
+ * negative value to remove any existing callback.
+ * \param callback callback function
+ * \param p user parameter passed to callback function
+ * \return NSERROR_OK on sucess or appropriate error on faliure
+ *
+ * The callback function will be called as soon as possible
+ * after the timeout has elapsed.
+ *
+ * Additional calls with the same callback and user parameter will
+ * reset the callback time to the newly specified value.
+ *
+ */
+ nserror (*schedule)(int t, void (*callback)(void *p), void *p);
+
+ /**
+ * Warn the user of an event.
+ *
+ * \param[in] message A warning looked up in the message
+ * translation table
+ * \param[in] detail Additional text to be displayed or NULL.
+ * \return NSERROR_OK on success or error code if there was a
+ * faliure displaying the message to the user.
+ */
+ nserror (*warning)(const char *message, const char *detail);
+
+
+ /* Optional entries */
+
+ /**
+ * called to allow the gui to cleanup.
+ */
+ void (*quit)(void);
+
+ /**
+ * core has no fetcher for url
+ */
+ nserror (*launch_url)(struct nsurl *url);
+
+ /**
+ * Prompt the user to verify a certificate with issuse.
+ *
+ * \param url The URL being verified.
+ * \param certs The certificate to be verified
+ * \param num The number of certificates to be verified.
+ * \param cb Callback upon user decision.
+ * \param cbpw Context pointer passed to cb
+ */
+ void (*cert_verify)(struct nsurl *url, const struct ssl_cert_info *certs, unsigned long num, nserror (*cb)(bool proceed, void *pw), void *cbpw);
+
+ /**
+ * Prompt user for login
+ */
+ void (*login)(struct nsurl *url, const char *realm,
+ nserror (*cb)(bool proceed, void *pw), void *cbpw);
+
+ /**
+ * Prompt the user for a password for a PDF.
+ */
+ void (*pdf_password)(char **owner_pass, char **user_pass, char *path);
+
+};
+
+#endif
diff --git a/render/box.c b/render/box.c
index 07ea114..81c22ed 100644
--- a/render/box.c
+++ b/render/box.c
@@ -38,7 +38,7 @@
#include "content/handlers/css/utils.h"
#include "content/handlers/css/dump.h"
#include "desktop/scrollbar.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
diff --git a/render/box_construct.c b/render/box_construct.c
index 6dce5c6..372dcb3 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -46,7 +46,7 @@
#include "content/handlers/css/hints.h"
#include "content/handlers/css/select.h"
#include "netsurf/css.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
diff --git a/render/form.c b/render/form.c
index 75d16d8..71849c2 100644
--- a/render/form.c
+++ b/render/form.c
@@ -50,7 +50,7 @@
#include "desktop/plotters.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
diff --git a/render/html.c b/render/html.c
index 4793075..6120fdf 100644
--- a/render/html.c
+++ b/render/html.c
@@ -51,7 +51,7 @@
#include "desktop/browser.h"
#include "netsurf/utf8.h"
#include "desktop/gui_layout.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
diff --git a/render/html_css.c b/render/html_css.c
index 0c8ee33..a3973bf 100644
--- a/render/html_css.c
+++ b/render/html_css.c
@@ -33,7 +33,7 @@
#include "utils/corestrings.h"
#include "utils/config.h"
#include "utils/log.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "render/html_internal.h"
diff --git a/render/html_interaction.c b/render/html_interaction.c
index 19e19f6..4d0a903 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -44,7 +44,7 @@
#include "desktop/textarea.h"
#include "desktop/textinput.h"
#include "javascript/js.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_layout.h"
#include "desktop/gui_internal.h"
diff --git a/render/html_object.c b/render/html_object.c
index 9e5e267..baa01e5 100644
--- a/render/html_object.c
+++ b/render/html_object.c
@@ -35,7 +35,7 @@
#include "content/hlcache.h"
#include "content/handlers/css/utils.h"
#include "desktop/scrollbar.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
diff --git a/render/search.c b/render/search.c
index 4a1cd2c..523f8fb 100644
--- a/render/search.c
+++ b/render/search.c
@@ -34,7 +34,7 @@
#include "content/hlcache.h"
#include "desktop/selection.h"
#include "netsurf/search.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=aa5090c85b6890f79d3...
commit aa5090c85b6890f79d340ad2de6219237f2d6c4c
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
move utf8 header into public API
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index d917a35..db675a7 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -36,7 +36,7 @@
#include "netsurf/window.h"
#include "netsurf/search.h"
#include "netsurf/clipboard.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/utf8.h"
#include "desktop/gui_layout.h"
#include "desktop/netsurf.h"
diff --git a/desktop/gui_utf8.h b/desktop/gui_utf8.h
deleted file mode 100644
index c40c4c1..0000000
--- a/desktop/gui_utf8.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-/**
- * \file
- *
- * Interface to platform-specific utf8 operations.
- */
-
-#ifndef _NETSURF_DESKTOP_GUI_UTF8_H_
-#define _NETSURF_DESKTOP_GUI_UTF8_H_
-
-/**
- * User interface utf8 characterset conversion routines.
- */
-struct gui_utf8_table {
- /**
- * Convert a UTF-8 encoded string into the system local encoding
- *
- * \param string The string to convert
- * \param len The length (in bytes) of the string, or 0
- * \param result Pointer to location in which to store result
- * \return An nserror code
- */
- nserror (*utf8_to_local)(const char *string, size_t len, char **result);
-
- /**
- * Convert a string encoded in the system local encoding to UTF-8
- *
- * \param string The string to convert
- * \param len The length (in bytes) of the string, or 0
- * \param result Pointer to location in which to store result
- * \return An nserror code
- */
- nserror (*local_to_utf8)(const char *string, size_t len, char **result);
-};
-
-#endif
diff --git a/desktop/save_text.c b/desktop/save_text.c
index 81c3db6..dee1c91 100644
--- a/desktop/save_text.c
+++ b/desktop/save_text.c
@@ -36,7 +36,7 @@
#include "render/box.h"
#include "render/html.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/utf8.h"
#include "desktop/gui_internal.h"
#include "desktop/save_text.h"
diff --git a/frontends/amiga/utf8.c b/frontends/amiga/utf8.c
index 91d7c90..24af8c8 100755
--- a/frontends/amiga/utf8.c
+++ b/frontends/amiga/utf8.c
@@ -25,7 +25,7 @@
#include "utils/nsoption.h"
#include "utils/utf8.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/utf8.h"
#include "amiga/utf8.h"
diff --git a/frontends/atari/encoding.c b/frontends/atari/encoding.c
index 9a16cbd..5997cb0 100644
--- a/frontends/atari/encoding.c
+++ b/frontends/atari/encoding.c
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include "utils/errors.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/utf8.h"
#include "atari/encoding.h"
diff --git a/frontends/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c
index 7756ae7..d1ac9ed 100644
--- a/frontends/framebuffer/font_freetype.c
+++ b/frontends/framebuffer/font_freetype.c
@@ -27,7 +27,7 @@
#include "utils/utf8.h"
#include "utils/log.h"
#include "utils/nsoption.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/utf8.h"
#include "desktop/gui_layout.h"
#include "desktop/browser.h"
diff --git a/frontends/framebuffer/font_internal.c b/frontends/framebuffer/font_internal.c
index 7578e64..9b15858 100644
--- a/frontends/framebuffer/font_internal.c
+++ b/frontends/framebuffer/font_internal.c
@@ -24,7 +24,7 @@
#include "utils/nsoption.h"
#include "utils/utf8.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/utf8.h"
#include "desktop/gui_layout.h"
#include "framebuffer/gui.h"
diff --git a/frontends/riscos/ucstables.c b/frontends/riscos/ucstables.c
index 7ac685d..8e538ef 100644
--- a/frontends/riscos/ucstables.c
+++ b/frontends/riscos/ucstables.c
@@ -32,7 +32,7 @@
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/utils.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/utf8.h"
#include "riscos/ucstables.h"
diff --git a/frontends/windows/font.c b/frontends/windows/font.c
index f67205a..8af7ea6 100644
--- a/frontends/windows/font.c
+++ b/frontends/windows/font.c
@@ -31,7 +31,7 @@
#include "utils/nsoption.h"
#include "utils/utf8.h"
#include "desktop/gui_layout.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/utf8.h"
#include "windows/font.h"
diff --git a/include/netsurf/utf8.h b/include/netsurf/utf8.h
new file mode 100644
index 0000000..c40c4c1
--- /dev/null
+++ b/include/netsurf/utf8.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+/**
+ * \file
+ *
+ * Interface to platform-specific utf8 operations.
+ */
+
+#ifndef _NETSURF_DESKTOP_GUI_UTF8_H_
+#define _NETSURF_DESKTOP_GUI_UTF8_H_
+
+/**
+ * User interface utf8 characterset conversion routines.
+ */
+struct gui_utf8_table {
+ /**
+ * Convert a UTF-8 encoded string into the system local encoding
+ *
+ * \param string The string to convert
+ * \param len The length (in bytes) of the string, or 0
+ * \param result Pointer to location in which to store result
+ * \return An nserror code
+ */
+ nserror (*utf8_to_local)(const char *string, size_t len, char **result);
+
+ /**
+ * Convert a string encoded in the system local encoding to UTF-8
+ *
+ * \param string The string to convert
+ * \param len The length (in bytes) of the string, or 0
+ * \param result Pointer to location in which to store result
+ * \return An nserror code
+ */
+ nserror (*local_to_utf8)(const char *string, size_t len, char **result);
+};
+
+#endif
diff --git a/render/html.c b/render/html.c
index 5090b6f..4793075 100644
--- a/render/html.c
+++ b/render/html.c
@@ -49,7 +49,7 @@
#include "netsurf/bitmap.h"
#include "javascript/js.h"
#include "desktop/browser.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/utf8.h"
#include "desktop/gui_layout.h"
#include "desktop/gui_misc.h"
#include "desktop/gui_internal.h"
diff --git a/utils/utf8.c b/utils/utf8.c
index b1871b2..5c930cd 100644
--- a/utils/utf8.c
+++ b/utils/utf8.c
@@ -32,7 +32,7 @@
#include "utils/log.h"
#include "utils/utf8.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/utf8.h"
#include "desktop/gui_internal.h"
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=c821ed2bbd91e1b4fe2...
commit c821ed2bbd91e1b4fe2b74c01cce1a4106f37655
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
move download header into public API
diff --git a/desktop/download.c b/desktop/download.c
index 131bc80..76c2949 100644
--- a/desktop/download.c
+++ b/desktop/download.c
@@ -30,7 +30,7 @@
#include "utils/http.h"
#include "utils/utils.h"
#include "desktop/download.h"
-#include "desktop/gui_download.h"
+#include "netsurf/download.h"
#include "desktop/gui_internal.h"
/**
diff --git a/desktop/gui_download.h b/desktop/gui_download.h
deleted file mode 100644
index 55e115d..0000000
--- a/desktop/gui_download.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-/**
- * \file
- *
- * Interface to platform-specific download operations.
- */
-
-#ifndef _NETSURF_DESKTOP_GUI_DOWNLOAD_H_
-#define _NETSURF_DESKTOP_GUI_DOWNLOAD_H_
-
-struct gui_window;
-struct download_context;
-
-/**
- * function table for download windows.
- */
-struct gui_download_table {
- struct gui_download_window *(*create)(struct download_context *ctx, struct gui_window *parent);
-
- nserror (*data)(struct gui_download_window *dw, const char *data, unsigned int size);
-
- void (*error)(struct gui_download_window *dw, const char *error_msg);
-
- void (*done)(struct gui_download_window *dw);
-};
-
-#endif
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index 65a3c58..d917a35 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -30,7 +30,7 @@
#include "desktop/save_pdf.h"
#include "desktop/download.h"
#include "desktop/searchweb.h"
-#include "desktop/gui_download.h"
+#include "netsurf/download.h"
#include "desktop/gui_fetch.h"
#include "desktop/gui_misc.h"
#include "netsurf/window.h"
diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c
index 2b7d0e3..8b122ec 100644
--- a/frontends/amiga/download.c
+++ b/frontends/amiga/download.c
@@ -53,7 +53,7 @@
#include "desktop/browser.h"
#include "desktop/mouse.h"
#include "netsurf/window.h"
-#include "desktop/gui_download.h"
+#include "netsurf/download.h"
#include "content/handlers/image/ico.h"
#include "amiga/gui.h"
diff --git a/frontends/atari/download.c b/frontends/atari/download.c
index 9ebe787..c763ed2 100644
--- a/frontends/atari/download.c
+++ b/frontends/atari/download.c
@@ -36,7 +36,7 @@
#include "desktop/textinput.h"
#include "desktop/download.h"
#include "desktop/browser.h"
-#include "desktop/gui_download.h"
+#include "netsurf/download.h"
#include "atari/gui.h"
#include "atari/misc.h"
diff --git a/frontends/beos/download.cpp b/frontends/beos/download.cpp
index ea0271e..b64591c 100644
--- a/frontends/beos/download.cpp
+++ b/frontends/beos/download.cpp
@@ -23,7 +23,7 @@
extern "C" {
#include "desktop/download.h"
-#include "desktop/gui_download.h"
+#include "netsurf/download.h"
#include "utils/utils.h"
#include "utils/string.h"
}
diff --git a/frontends/cocoa/DownloadWindowController.m b/frontends/cocoa/DownloadWindowController.m
index 0c9d869..b8cf09b 100644
--- a/frontends/cocoa/DownloadWindowController.m
+++ b/frontends/cocoa/DownloadWindowController.m
@@ -19,7 +19,7 @@
#import "utils/log.h"
#import "utils/nsurl.h"
#import "desktop/download.h"
-#import "desktop/gui_download.h"
+#import "netsurf/download.h"
#import "cocoa/DownloadWindowController.h"
#import "cocoa/gui.h"
diff --git a/frontends/gtk/download.c b/frontends/gtk/download.c
index b7eea25..8c81614 100644
--- a/frontends/gtk/download.c
+++ b/frontends/gtk/download.c
@@ -30,7 +30,7 @@
#include "utils/nsoption.h"
#include "utils/string.h"
#include "desktop/download.h"
-#include "desktop/gui_download.h"
+#include "netsurf/download.h"
#include "gtk/warn.h"
#include "gtk/scaffolding.h"
diff --git a/frontends/monkey/download.c b/frontends/monkey/download.c
index 2421366..3224105 100644
--- a/frontends/monkey/download.c
+++ b/frontends/monkey/download.c
@@ -22,7 +22,7 @@
#include "utils/errors.h"
#include "utils/ring.h"
-#include "desktop/gui_download.h"
+#include "netsurf/download.h"
#include "desktop/download.h"
#include "content/hlcache.h"
diff --git a/frontends/riscos/download.c b/frontends/riscos/download.c
index cddb449..7dd61b7 100644
--- a/frontends/riscos/download.c
+++ b/frontends/riscos/download.c
@@ -22,7 +22,7 @@
* \file
* RISC OS download windows implementation.
*
- * This file implements the interface given by desktop/gui_download.h
+ * This file implements the interface given by netsurf/download.h
* for download windows. Each download window has an associated
* fetch. Downloads start by writing received data to a temporary
* file. At some point the user chooses a destination (by drag &
@@ -54,7 +54,7 @@
#include "utils/utils.h"
#include "utils/string.h"
#include "utils/corestrings.h"
-#include "desktop/gui_download.h"
+#include "netsurf/download.h"
#include "desktop/download.h"
#include "riscos/gui.h"
diff --git a/frontends/windows/download.c b/frontends/windows/download.c
index b281ea7..f1a0287 100644
--- a/frontends/windows/download.c
+++ b/frontends/windows/download.c
@@ -31,7 +31,7 @@
#include "utils/utils.h"
#include "utils/string.h"
#include "content/fetch.h"
-#include "desktop/gui_download.h"
+#include "netsurf/download.h"
#include "desktop/download.h"
#include "windows/download.h"
diff --git a/include/netsurf/download.h b/include/netsurf/download.h
new file mode 100644
index 0000000..55e115d
--- /dev/null
+++ b/include/netsurf/download.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+/**
+ * \file
+ *
+ * Interface to platform-specific download operations.
+ */
+
+#ifndef _NETSURF_DESKTOP_GUI_DOWNLOAD_H_
+#define _NETSURF_DESKTOP_GUI_DOWNLOAD_H_
+
+struct gui_window;
+struct download_context;
+
+/**
+ * function table for download windows.
+ */
+struct gui_download_table {
+ struct gui_download_window *(*create)(struct download_context *ctx, struct gui_window *parent);
+
+ nserror (*data)(struct gui_download_window *dw, const char *data, unsigned int size);
+
+ void (*error)(struct gui_download_window *dw, const char *error_msg);
+
+ void (*done)(struct gui_download_window *dw);
+};
+
+#endif
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d240bec03627f5a26cd...
commit d240bec03627f5a26cd70e83a58483c69834f7c2
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
move clipboard header into public API
diff --git a/desktop/gui_clipboard.h b/desktop/gui_clipboard.h
deleted file mode 100644
index 6feea24..0000000
--- a/desktop/gui_clipboard.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-/**
- * \file
- *
- * Interface to platform-specific clipboard operations.
- */
-
-#ifndef _NETSURF_DESKTOP_GUI_CLIPBOARD_H_
-#define _NETSURF_DESKTOP_GUI_CLIPBOARD_H_
-
-#include <stddef.h>
-
-#include "utils/errors.h"
-#include "desktop/plot_style.h"
-
-typedef struct nsnsclipboard_styles {
- size_t start; /**< Start of run */
-
- plot_font_style_t style; /**< Style to give text run */
-} nsclipboard_styles;
-
-/**
- * function table for clipboard operations.
- */
-struct gui_clipboard_table {
- /**
- * Core asks front end for clipboard contents.
- *
- * \param buffer UTF-8 text, allocated by front end, ownership yeilded to core
- * \param length Byte length of UTF-8 text in buffer
- */
- void (*get)(char **buffer, size_t *length);
-
- /**
- * Core tells front end to put given text in clipboard
- *
- * \param buffer UTF-8 text, owned by core
- * \param length Byte length of UTF-8 text in buffer
- * \param styles Array of styles given to text runs, owned by core, or NULL
- * \param n_styles Number of text run styles in array
- */
- void (*set)(const char *buffer, size_t length, nsclipboard_styles styles[], int n_styles);
-};
-
-#endif
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index 5ee6326..65a3c58 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -35,7 +35,7 @@
#include "desktop/gui_misc.h"
#include "netsurf/window.h"
#include "netsurf/search.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
#include "desktop/gui_utf8.h"
#include "desktop/gui_layout.h"
#include "desktop/netsurf.h"
diff --git a/desktop/selection.c b/desktop/selection.c
index 8f064d4..d2e326a 100644
--- a/desktop/selection.c
+++ b/desktop/selection.c
@@ -42,7 +42,7 @@
#include "desktop/plotters.h"
#include "desktop/save_text.h"
#include "desktop/selection.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
#include "netsurf/window.h"
#include "desktop/gui_internal.h"
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 96a1713..833815e 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -37,7 +37,7 @@
#include "desktop/textinput.h"
#include "desktop/plotters.h"
#include "desktop/scrollbar.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
#include "desktop/gui_layout.h"
#include "desktop/gui_internal.h"
diff --git a/desktop/treeview.c b/desktop/treeview.c
index ec2a513..d72bf2f 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -32,7 +32,7 @@
#include "desktop/plotters.h"
#include "desktop/textarea.h"
#include "desktop/treeview.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
#include "desktop/gui_layout.h"
#include "desktop/gui_internal.h"
diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c
index f906e5f..2322f0e 100644
--- a/frontends/amiga/clipboard.c
+++ b/frontends/amiga/clipboard.c
@@ -35,7 +35,7 @@
#include "desktop/plotters.h"
#include "desktop/textinput.h"
#include "netsurf/window.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
#include "amiga/bitmap.h"
#include "amiga/clipboard.h"
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 9e6fd5e..5107f83 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -37,7 +37,7 @@
#include "desktop/browser.h"
#include "desktop/gui_layout.h"
#include "netsurf/window.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
#include "desktop/gui_fetch.h"
#include "desktop/gui_misc.h"
#include "desktop/netsurf.h"
diff --git a/frontends/beos/about.cpp b/frontends/beos/about.cpp
index 89eb818..70268ce 100644
--- a/frontends/beos/about.cpp
+++ b/frontends/beos/about.cpp
@@ -26,7 +26,7 @@ extern "C" {
#include "testament.h"
#include "utils/useragent.h"
#include "curl/curlver.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
}
#include "beos/about.h"
#include "beos/scaffolding.h"
diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp
index 4c0fb51..645d7d6 100644
--- a/frontends/beos/gui.cpp
+++ b/frontends/beos/gui.cpp
@@ -64,7 +64,7 @@ extern "C" {
#include "content/urldb.h"
#include "desktop/browser.h"
#include "desktop/gui_misc.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
#include "netsurf/search.h"
#include "desktop/gui_fetch.h"
#include "desktop/netsurf.h"
diff --git a/frontends/beos/login.cpp b/frontends/beos/login.cpp
index 7689c9d..de2370d 100644
--- a/frontends/beos/login.cpp
+++ b/frontends/beos/login.cpp
@@ -34,7 +34,7 @@ extern "C" {
#include "utils/messages.h"
#include "utils/url.h"
#include "utils/utils.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
}
#include "beos/gui.h"
#include "beos/scaffolding.h"
diff --git a/frontends/beos/scaffolding.cpp b/frontends/beos/scaffolding.cpp
index 630e059..9780884 100644
--- a/frontends/beos/scaffolding.cpp
+++ b/frontends/beos/scaffolding.cpp
@@ -67,7 +67,7 @@ extern "C" {
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/nsurl.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
}
#include "beos/about.h"
#include "beos/bitmap.h"
diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp
index 2938b15..27be987 100644
--- a/frontends/beos/window.cpp
+++ b/frontends/beos/window.cpp
@@ -34,7 +34,7 @@ extern "C" {
#include "desktop/textinput.h"
#include "desktop/plotters.h"
#include "netsurf/window.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
}
#include "beos/about.h"
diff --git a/frontends/cocoa/selection.m b/frontends/cocoa/selection.m
index 808b706..37562bc 100644
--- a/frontends/cocoa/selection.m
+++ b/frontends/cocoa/selection.m
@@ -21,7 +21,7 @@
#import "cocoa/BrowserViewController.h"
#import "cocoa/selection.h"
-#import "desktop/gui_clipboard.h"
+#import "netsurf/clipboard.h"
static NSMutableString *cocoa_clipboard_string;
diff --git a/frontends/framebuffer/clipboard.c b/frontends/framebuffer/clipboard.c
index 05defe8..1d41622 100644
--- a/frontends/framebuffer/clipboard.c
+++ b/frontends/framebuffer/clipboard.c
@@ -27,7 +27,7 @@
#include "utils/log.h"
#include "desktop/browser.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
#include "framebuffer/gui.h"
#include "framebuffer/clipboard.h"
diff --git a/frontends/gtk/selection.c b/frontends/gtk/selection.c
index d1388ed..ae44e78 100644
--- a/frontends/gtk/selection.c
+++ b/frontends/gtk/selection.c
@@ -22,7 +22,7 @@
#include "utils/log.h"
#include "desktop/browser.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
#include "gtk/window.h"
diff --git a/frontends/riscos/textselection.c b/frontends/riscos/textselection.c
index 0ddb26d..81ccc3a 100644
--- a/frontends/riscos/textselection.c
+++ b/frontends/riscos/textselection.c
@@ -31,7 +31,7 @@
#include "utils/utf8.h"
#include "utils/utils.h"
#include "content/hlcache.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
#include "netsurf/window.h"
#include "desktop/textinput.h"
#include "desktop/browser.h"
diff --git a/frontends/windows/gui.c b/frontends/windows/gui.c
index 9923ecf..cb75cdf 100644
--- a/frontends/windows/gui.c
+++ b/frontends/windows/gui.c
@@ -32,7 +32,7 @@
#include "utils/file.h"
#include "utils/messages.h"
#include "desktop/browser.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
#include "windows/schedule.h"
#include "windows/window.h"
diff --git a/frontends/windows/pointers.c b/frontends/windows/pointers.c
index b5b7454..abb4fe7 100644
--- a/frontends/windows/pointers.c
+++ b/frontends/windows/pointers.c
@@ -30,7 +30,7 @@
#include "utils/url.h"
#include "utils/file.h"
#include "desktop/browser.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
#include "windows/schedule.h"
#include "windows/window.h"
diff --git a/include/netsurf/clipboard.h b/include/netsurf/clipboard.h
new file mode 100644
index 0000000..6feea24
--- /dev/null
+++ b/include/netsurf/clipboard.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+/**
+ * \file
+ *
+ * Interface to platform-specific clipboard operations.
+ */
+
+#ifndef _NETSURF_DESKTOP_GUI_CLIPBOARD_H_
+#define _NETSURF_DESKTOP_GUI_CLIPBOARD_H_
+
+#include <stddef.h>
+
+#include "utils/errors.h"
+#include "desktop/plot_style.h"
+
+typedef struct nsnsclipboard_styles {
+ size_t start; /**< Start of run */
+
+ plot_font_style_t style; /**< Style to give text run */
+} nsclipboard_styles;
+
+/**
+ * function table for clipboard operations.
+ */
+struct gui_clipboard_table {
+ /**
+ * Core asks front end for clipboard contents.
+ *
+ * \param buffer UTF-8 text, allocated by front end, ownership yeilded to core
+ * \param length Byte length of UTF-8 text in buffer
+ */
+ void (*get)(char **buffer, size_t *length);
+
+ /**
+ * Core tells front end to put given text in clipboard
+ *
+ * \param buffer UTF-8 text, owned by core
+ * \param length Byte length of UTF-8 text in buffer
+ * \param styles Array of styles given to text runs, owned by core, or NULL
+ * \param n_styles Number of text run styles in array
+ */
+ void (*set)(const char *buffer, size_t length, nsclipboard_styles styles[], int n_styles);
+};
+
+#endif
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=1eb86d9df2d6897d11b...
commit 1eb86d9df2d6897d11b712f21d4ac23390fbdc70
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
move window header into public API
diff --git a/desktop/browser.c b/desktop/browser.c
index 2ee36fd..bb39ee3 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -71,7 +71,7 @@
#include "desktop/plotters.h"
#include "desktop/theme.h"
#include "desktop/gui_misc.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_internal.h"
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index 0aba197..5ee6326 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -33,7 +33,7 @@
#include "desktop/gui_download.h"
#include "desktop/gui_fetch.h"
#include "desktop/gui_misc.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "netsurf/search.h"
#include "desktop/gui_clipboard.h"
#include "desktop/gui_utf8.h"
diff --git a/desktop/gui_window.h b/desktop/gui_window.h
deleted file mode 100644
index 7ecd3c2..0000000
--- a/desktop/gui_window.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-/**
- * \file
- *
- * Interface to platform-specific graphical user interface window
- * operations.
- */
-
-#ifndef _NETSURF_DESKTOP_GUI_WINDOW_H_
-#define _NETSURF_DESKTOP_GUI_WINDOW_H_
-
-typedef enum gui_save_type {
- GUI_SAVE_SOURCE,
- GUI_SAVE_DRAW,
- GUI_SAVE_PDF,
- GUI_SAVE_TEXT,
- GUI_SAVE_COMPLETE,
- GUI_SAVE_OBJECT_ORIG,
- GUI_SAVE_OBJECT_NATIVE,
- GUI_SAVE_LINK_URI,
- GUI_SAVE_LINK_URL,
- GUI_SAVE_LINK_TEXT,
- GUI_SAVE_HOTLIST_EXPORT_HTML,
- GUI_SAVE_HISTORY_EXPORT_HTML,
- GUI_SAVE_TEXT_SELECTION,
- GUI_SAVE_CLIPBOARD_CONTENTS
-} gui_save_type;
-
-typedef enum {
- GDRAGGING_NONE,
- GDRAGGING_SCROLLBAR,
- GDRAGGING_SELECTION,
- GDRAGGING_OTHER
-} gui_drag_type;
-
-typedef enum {
- GW_CREATE_NONE = 0, /* New window */
- GW_CREATE_CLONE = (1 << 0), /* Clone existing window */
- GW_CREATE_TAB = (1 << 1) /* In same window as existing */
-} gui_window_create_flags;
-
-struct browser_window;
-struct form_control;
-struct rect;
-struct hlcache_handle;
-struct nsurl;
-
-enum gui_pointer_shape;
-
-/**
- * Graphical user interface window function table.
- *
- * function table implementing window operations
- */
-struct gui_window_table {
-
- /* Mandantory entries */
-
- /**
- * Create and open a gui window for a browsing context.
- *
- * \param bw bw to create gui_window for
- * \param existing an existing gui_window, may be NULL
- * \param flags flags for gui window creation
- * \return gui window, or NULL on error
- *
- * If GW_CREATE_CLONE flag is set existing is non-NULL.
- *
- * Front end's gui_window must include a reference to the
- * browser window passed in the bw param.
- */
- struct gui_window *(*create)(struct browser_window *bw,
- struct gui_window *existing,
- gui_window_create_flags flags);
-
- /**
- * Destroy previously created gui window
- *
- * \param gw The gui window to destroy.
- */
- void (*destroy)(struct gui_window *gw);
-
- /**
- * Force a redraw of the entire contents of a window.
- *
- * @todo this API should be merged with update.
- *
- * \param g gui_window to redraw
- */
- void (*redraw)(struct gui_window *g);
-
- /**
- * Redraw an area of a window.
- *
- * \param g gui_window
- * \param rect area to redraw
- */
- void (*update)(struct gui_window *g, const struct rect *rect);
-
- /**
- * Get the scroll position of a browser window.
- *
- * \param g gui_window
- * \param sx receives x ordinate of point at top-left of window
- * \param sy receives y ordinate of point at top-left of window
- * \return true iff successful
- */
- bool (*get_scroll)(struct gui_window *g, int *sx, int *sy);
-
- /**
- * Set the scroll position of a browser window.
- *
- * \param g gui_window to scroll
- * \param sx point to place at top-left of window
- * \param sy point to place at top-left of window
- */
- void (*set_scroll)(struct gui_window *g, int sx, int sy);
-
- /**
- * Find the current dimensions of a browser window's content area.
- *
- * @todo The implementations of this are buggy and its only
- * used from frames code.
- *
- * \param g gui_window to measure
- * \param width receives width of window
- * \param height receives height of window
- * \param scaled whether to return scaled values
- */
- void (*get_dimensions)(struct gui_window *g, int *width, int *height, bool scaled);
-
- /**
- * Update the extent of the inside of a browser window to that of the
- * current content.
- *
- * @todo this is used to update scroll bars does it need
- * renaming? some frontends (windows) do not even implement it.
- *
- * \param g gui_window to update the extent of
- */
- void (*update_extent)(struct gui_window *g);
-
- /**
- * Reformat a window.
- *
- * This is used to perform reformats when the page contents
- * require reformating. The reformat is requested using
- * browser_window_schedule_reformat and occours via a scheduled
- * callback hence from top level context.
- *
- * \param g gui_window to reformat.
- */
- void (*reformat)(struct gui_window *g);
-
-
- /* Optional entries */
-
- /**
- * Set the title of a window.
- *
- * \param g window to update
- * \param title new window title
- */
- void (*set_title)(struct gui_window *g, const char *title);
-
- /**
- * Set the navigation url.
- *
- * \param gw window to update.
- * \param url The url to use as icon.
- */
- nserror (*set_url)(struct gui_window *gw, struct nsurl *url);
-
- /**
- * Set a favicon for a gui window.
- *
- * \param gw window to update.
- * \param icon handle to object to use as icon.
- */
- void (*set_icon)(struct gui_window *gw, struct hlcache_handle *icon);
-
- /**
- * Set the status bar of a browser window.
- *
- * \param g gui_window to update
- * \param text new status text
- */
- void (*set_status)(struct gui_window *g, const char *text);
-
- /**
- * Change mouse pointer shape
- */
- void (*set_pointer)(struct gui_window *g, enum gui_pointer_shape shape);
-
- /**
- * Place the caret in a browser window.
- *
- * \param g window with caret
- * \param x coordinates of caret
- * \param y coordinates of caret
- * \param height height of caret
- * \param clip clip rectangle, or NULL if none
- */
- void (*place_caret)(struct gui_window *g, int x, int y, int height, const struct rect *clip);
-
- /**
- * Remove the caret, if present.
- *
- * \param g window with caret
- */
- void (*remove_caret)(struct gui_window *g);
-
- /** start the navigation throbber. */
- void (*start_throbber)(struct gui_window *g);
-
- /** stop the navigation throbber. */
- void (*stop_throbber)(struct gui_window *g);
-
- /** start a drag operation within a window */
- bool (*drag_start)(struct gui_window *g, gui_drag_type type, const struct rect *rect);
-
- /** save link operation */
- nserror (*save_link)(struct gui_window *g, struct nsurl *url, const char *title);
-
- /**
- * Scrolls the specified area of a browser window into view.
- *
- * @todo investigate if this can be merged with set_scroll
- * which is what the default implementation used by most
- * toolkits uses.
- *
- * \param g gui_window to scroll
- * \param x0 left point to ensure visible
- * \param y0 bottom point to ensure visible
- * \param x1 right point to ensure visible
- * \param y1 top point to ensure visible
- */
- void (*scroll_visible)(struct gui_window *g, int x0, int y0, int x1, int y1);
-
- /**
- * Starts drag scrolling of a browser window
- *
- * \param g the window to scroll
- */
- bool (*scroll_start)(struct gui_window *g);
-
- /**
- * Called when the gui_window has new content.
- *
- * \param g the gui_window that has new content
- */
- void (*new_content)(struct gui_window *g);
-
- /**
- * create a form select menu
- */
- void (*create_form_select_menu)(struct gui_window *gw, struct form_control *control);
-
- /**
- * Called when file chooser gadget is activated
- */
- void (*file_gadget_open)(struct gui_window *g, struct hlcache_handle *hl, struct form_control *gadget);
-
- /** object dragged to window*/
- void (*drag_save_object)(struct gui_window *g, struct hlcache_handle *c, gui_save_type type);
-
- /** drag selection save */
- void (*drag_save_selection)(struct gui_window *g, const char *selection);
-
- /** selection started */
- void (*start_selection)(struct gui_window *g);
-};
-
-#endif
diff --git a/desktop/selection.c b/desktop/selection.c
index e2bd747..8f064d4 100644
--- a/desktop/selection.c
+++ b/desktop/selection.c
@@ -43,7 +43,7 @@
#include "desktop/save_text.h"
#include "desktop/selection.h"
#include "desktop/gui_clipboard.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_internal.h"
/**
diff --git a/desktop/textinput.c b/desktop/textinput.c
index bd51d5a..015c669 100644
--- a/desktop/textinput.c
+++ b/desktop/textinput.c
@@ -41,7 +41,7 @@
#include "desktop/mouse.h"
#include "desktop/browser_private.h"
#include "desktop/textinput.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_internal.h"
/* Define to enable textinput debug */
diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c
index c5b5ab4..38274f1 100644
--- a/frontends/amiga/arexx.c
+++ b/frontends/amiga/arexx.c
@@ -35,7 +35,7 @@
#include "utils/nsurl.h"
#include "content/hlcache.h"
#include "desktop/browser.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/version.h"
#include "amiga/arexx.h"
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index cf342d8..506ae33 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -49,7 +49,7 @@
#include "utils/messages.h"
#include "content/hlcache.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "netsurf/bitmap.h"
#include "amiga/gui.h"
diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c
index 12ceb0f..f906e5f 100644
--- a/frontends/amiga/clipboard.c
+++ b/frontends/amiga/clipboard.c
@@ -34,7 +34,7 @@
#include "desktop/browser.h"
#include "desktop/plotters.h"
#include "desktop/textinput.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_clipboard.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/cookies.c b/frontends/amiga/cookies.c
index 0ca1741..3181d0f 100755
--- a/frontends/amiga/cookies.c
+++ b/frontends/amiga/cookies.c
@@ -20,7 +20,7 @@
#include "desktop/cookie_manager.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/cookies.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c
index c646a5f..2b7d0e3 100644
--- a/frontends/amiga/download.c
+++ b/frontends/amiga/download.c
@@ -52,7 +52,7 @@
#include "desktop/save_complete.h"
#include "desktop/browser.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_download.h"
#include "content/handlers/image/ico.h"
diff --git a/frontends/amiga/drag.h b/frontends/amiga/drag.h
index 59a1a84..b8ccec1 100644
--- a/frontends/amiga/drag.h
+++ b/frontends/amiga/drag.h
@@ -20,7 +20,7 @@
#define AMIGA_DRAG_H
#include <exec/types.h>
#include "desktop/browser.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#define AMI_DRAG_THRESHOLD 10
diff --git a/frontends/amiga/file.c b/frontends/amiga/file.c
index 8957ecf..3b5d541 100644
--- a/frontends/amiga/file.c
+++ b/frontends/amiga/file.c
@@ -33,7 +33,7 @@
#include "desktop/save_complete.h"
#include "desktop/save_pdf.h"
#include "desktop/save_text.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/gui.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/font_scan.c b/frontends/amiga/font_scan.c
index b65798d..12fb607 100644
--- a/frontends/amiga/font_scan.c
+++ b/frontends/amiga/font_scan.c
@@ -49,7 +49,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/font_scan.h"
#include "amiga/gui.h"
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index b3f4171..88a06c6 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -112,7 +112,7 @@
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_fetch.h"
#include "desktop/gui_misc.h"
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index d301ac5..10e89cd 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -25,7 +25,7 @@
#include <dos/dos.h>
#include <devices/inputevent.h>
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/mouse.h"
#include "amiga/menu.h"
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index 9402a3f..f921b09 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -63,7 +63,7 @@
#include "utils/nsoption.h"
#include "desktop/browser.h"
#include "desktop/searchweb.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/file.h"
#include "amiga/font.h"
diff --git a/frontends/amiga/history.c b/frontends/amiga/history.c
index 72b69d4..61425f3 100755
--- a/frontends/amiga/history.c
+++ b/frontends/amiga/history.c
@@ -21,7 +21,7 @@
#include "utils/errors.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/history.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/history_local.c b/frontends/amiga/history_local.c
index 3016cbf..3be097f 100755
--- a/frontends/amiga/history_local.c
+++ b/frontends/amiga/history_local.c
@@ -47,7 +47,7 @@
#include "desktop/browser_history.h"
#include "desktop/browser.h"
#include "desktop/plotters.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "graphics/rpattr.h"
#include "amiga/libs.h"
diff --git a/frontends/amiga/hotlist.c b/frontends/amiga/hotlist.c
index 79e679f..71720cb 100755
--- a/frontends/amiga/hotlist.c
+++ b/frontends/amiga/hotlist.c
@@ -22,7 +22,7 @@
#include "utils/nsurl.h"
#include "desktop/hotlist.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/hotlist.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/login.c b/frontends/amiga/login.c
index a4c0d62..3458515 100755
--- a/frontends/amiga/login.c
+++ b/frontends/amiga/login.c
@@ -42,7 +42,7 @@
#include "utils/errors.h"
#include "content/urldb.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/gui.h"
#include "amiga/libs.h"
diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c
index 4a30c48..969a65d 100644
--- a/frontends/amiga/menu.c
+++ b/frontends/amiga/menu.c
@@ -51,7 +51,7 @@
#include "desktop/hotlist.h"
#include "desktop/browser.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/textinput.h"
#include "desktop/version.h"
diff --git a/frontends/amiga/misc.c b/frontends/amiga/misc.c
index 2c23358..1fc0373 100755
--- a/frontends/amiga/misc.c
+++ b/frontends/amiga/misc.c
@@ -36,7 +36,7 @@
#include "utils/nsurl.h"
#include "utils/url.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/gui.h"
#include "amiga/misc.h"
diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index fb9c923..1f74081 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -39,7 +39,7 @@
#include "utils/log.h"
#include "netsurf/css.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/plotters.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c
index fcccc91..ef70fe7 100644
--- a/frontends/amiga/print.c
+++ b/frontends/amiga/print.c
@@ -54,7 +54,7 @@
#include "desktop/print.h"
#include "desktop/gui_layout.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "content/hlcache.h"
#include "amiga/plotters.h"
diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c
index 71ed003..2ecb7af 100755
--- a/frontends/amiga/search.c
+++ b/frontends/amiga/search.c
@@ -51,7 +51,7 @@
#include "desktop/browser.h"
#include "desktop/search.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "netsurf/search.h"
#include "amiga/libs.h"
diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c
index 699ce71..ca6501a 100644
--- a/frontends/amiga/sslcert.c
+++ b/frontends/amiga/sslcert.c
@@ -21,7 +21,7 @@
#include "utils/nsurl.h"
#include "content/llcache.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/sslcert_viewer.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/theme.c b/frontends/amiga/theme.c
index ab32b23..f4fed12 100644
--- a/frontends/amiga/theme.c
+++ b/frontends/amiga/theme.c
@@ -42,7 +42,7 @@
#include "utils/utils.h"
#include "desktop/searchweb.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/gui.h"
#include "amiga/drag.h"
diff --git a/frontends/amiga/tree.c b/frontends/amiga/tree.c
index f147b5e..05c2fa7 100644
--- a/frontends/amiga/tree.c
+++ b/frontends/amiga/tree.c
@@ -59,7 +59,7 @@
#include "desktop/cookie_manager.h"
#include "desktop/global_history.h"
#include "desktop/hotlist.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/sslcert_viewer.h"
#include "amiga/gui.h"
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 810c764..9e6fd5e 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -36,7 +36,7 @@
#include "desktop/treeview.h"
#include "desktop/browser.h"
#include "desktop/gui_layout.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_clipboard.h"
#include "desktop/gui_fetch.h"
#include "desktop/gui_misc.h"
diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp
index 62624f0..2938b15 100644
--- a/frontends/beos/window.cpp
+++ b/frontends/beos/window.cpp
@@ -33,7 +33,7 @@ extern "C" {
#include "desktop/mouse.h"
#include "desktop/textinput.h"
#include "desktop/plotters.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_clipboard.h"
}
diff --git a/frontends/cocoa/gui.m b/frontends/cocoa/gui.m
index c24357d..326e286 100644
--- a/frontends/cocoa/gui.m
+++ b/frontends/cocoa/gui.m
@@ -22,7 +22,7 @@
#import "utils/utils.h"
#import "utils/log.h"
#import "desktop/mouse.h"
-#import "desktop/gui_window.h"
+#import "netsurf/window.h"
#import "desktop/gui_misc.h"
#import "desktop/browser.h"
#import "desktop/textinput.h"
diff --git a/frontends/framebuffer/gui.c b/frontends/framebuffer/gui.c
index b0b98c5..4a8b7a6 100644
--- a/frontends/framebuffer/gui.c
+++ b/frontends/framebuffer/gui.c
@@ -38,7 +38,7 @@
#include "desktop/textinput.h"
#include "desktop/browser_history.h"
#include "desktop/plotters.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_misc.h"
#include "desktop/netsurf.h"
#include "content/urldb.h"
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index de333d1..5d49eeb 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -43,7 +43,7 @@
#include "desktop/mouse.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/plotters.h"
#include "render/form.h"
diff --git a/frontends/monkey/browser.c b/frontends/monkey/browser.c
index dfd2dcf..4ae35a1 100644
--- a/frontends/monkey/browser.c
+++ b/frontends/monkey/browser.c
@@ -26,7 +26,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/browser.h"
#include "desktop/plotters.h"
#include "content/hlcache.h"
diff --git a/frontends/riscos/global_history.c b/frontends/riscos/global_history.c
index c469847..88c071c 100644
--- a/frontends/riscos/global_history.c
+++ b/frontends/riscos/global_history.c
@@ -36,7 +36,7 @@
#include "utils/log.h"
#include "desktop/global_history.h"
#include "desktop/tree.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "riscos/dialog.h"
#include "riscos/global_history.h"
diff --git a/frontends/riscos/help.c b/frontends/riscos/help.c
index 73cb695..faabea7 100644
--- a/frontends/riscos/help.c
+++ b/frontends/riscos/help.c
@@ -28,7 +28,7 @@
#include "utils/messages.h"
#include "utils/utf8.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "riscos/treeview.h"
#include "riscos/help.h"
diff --git a/frontends/riscos/hotlist.c b/frontends/riscos/hotlist.c
index 381978f..d4acbc6 100644
--- a/frontends/riscos/hotlist.c
+++ b/frontends/riscos/hotlist.c
@@ -39,7 +39,7 @@
#include "content/urldb.h"
#include "desktop/hotlist.h"
#include "desktop/tree.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "riscos/gui.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/save.c b/frontends/riscos/save.c
index 0432b1a..6eab315 100644
--- a/frontends/riscos/save.c
+++ b/frontends/riscos/save.c
@@ -48,7 +48,7 @@
#include "desktop/version.h"
#include "desktop/save_complete.h"
#include "desktop/save_text.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "netsurf/bitmap.h"
#include "render/form.h"
diff --git a/frontends/riscos/textselection.c b/frontends/riscos/textselection.c
index 718171d..0ddb26d 100644
--- a/frontends/riscos/textselection.c
+++ b/frontends/riscos/textselection.c
@@ -32,7 +32,7 @@
#include "utils/utils.h"
#include "content/hlcache.h"
#include "desktop/gui_clipboard.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/textinput.h"
#include "desktop/browser.h"
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index b6d074f..d386685 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -64,7 +64,7 @@
#include "desktop/plotters.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "netsurf/bitmap.h"
#include "render/form.h"
diff --git a/frontends/windows/plot.c b/frontends/windows/plot.c
index 86870ea..d5ddf4f 100644
--- a/frontends/windows/plot.c
+++ b/frontends/windows/plot.c
@@ -29,7 +29,7 @@
#include "utils/utf8.h"
#include "utils/utils.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/plotters.h"
#include "windows/bitmap.h"
diff --git a/frontends/windows/window.c b/frontends/windows/window.c
index f5f13fe..afc741f 100644
--- a/frontends/windows/window.c
+++ b/frontends/windows/window.c
@@ -31,7 +31,7 @@
#include "utils/messages.h"
#include "content/content.h"
#include "desktop/browser.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/browser_history.h"
#include "desktop/textinput.h"
diff --git a/include/netsurf/window.h b/include/netsurf/window.h
new file mode 100644
index 0000000..7ecd3c2
--- /dev/null
+++ b/include/netsurf/window.h
@@ -0,0 +1,291 @@
+/*
+ * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+/**
+ * \file
+ *
+ * Interface to platform-specific graphical user interface window
+ * operations.
+ */
+
+#ifndef _NETSURF_DESKTOP_GUI_WINDOW_H_
+#define _NETSURF_DESKTOP_GUI_WINDOW_H_
+
+typedef enum gui_save_type {
+ GUI_SAVE_SOURCE,
+ GUI_SAVE_DRAW,
+ GUI_SAVE_PDF,
+ GUI_SAVE_TEXT,
+ GUI_SAVE_COMPLETE,
+ GUI_SAVE_OBJECT_ORIG,
+ GUI_SAVE_OBJECT_NATIVE,
+ GUI_SAVE_LINK_URI,
+ GUI_SAVE_LINK_URL,
+ GUI_SAVE_LINK_TEXT,
+ GUI_SAVE_HOTLIST_EXPORT_HTML,
+ GUI_SAVE_HISTORY_EXPORT_HTML,
+ GUI_SAVE_TEXT_SELECTION,
+ GUI_SAVE_CLIPBOARD_CONTENTS
+} gui_save_type;
+
+typedef enum {
+ GDRAGGING_NONE,
+ GDRAGGING_SCROLLBAR,
+ GDRAGGING_SELECTION,
+ GDRAGGING_OTHER
+} gui_drag_type;
+
+typedef enum {
+ GW_CREATE_NONE = 0, /* New window */
+ GW_CREATE_CLONE = (1 << 0), /* Clone existing window */
+ GW_CREATE_TAB = (1 << 1) /* In same window as existing */
+} gui_window_create_flags;
+
+struct browser_window;
+struct form_control;
+struct rect;
+struct hlcache_handle;
+struct nsurl;
+
+enum gui_pointer_shape;
+
+/**
+ * Graphical user interface window function table.
+ *
+ * function table implementing window operations
+ */
+struct gui_window_table {
+
+ /* Mandantory entries */
+
+ /**
+ * Create and open a gui window for a browsing context.
+ *
+ * \param bw bw to create gui_window for
+ * \param existing an existing gui_window, may be NULL
+ * \param flags flags for gui window creation
+ * \return gui window, or NULL on error
+ *
+ * If GW_CREATE_CLONE flag is set existing is non-NULL.
+ *
+ * Front end's gui_window must include a reference to the
+ * browser window passed in the bw param.
+ */
+ struct gui_window *(*create)(struct browser_window *bw,
+ struct gui_window *existing,
+ gui_window_create_flags flags);
+
+ /**
+ * Destroy previously created gui window
+ *
+ * \param gw The gui window to destroy.
+ */
+ void (*destroy)(struct gui_window *gw);
+
+ /**
+ * Force a redraw of the entire contents of a window.
+ *
+ * @todo this API should be merged with update.
+ *
+ * \param g gui_window to redraw
+ */
+ void (*redraw)(struct gui_window *g);
+
+ /**
+ * Redraw an area of a window.
+ *
+ * \param g gui_window
+ * \param rect area to redraw
+ */
+ void (*update)(struct gui_window *g, const struct rect *rect);
+
+ /**
+ * Get the scroll position of a browser window.
+ *
+ * \param g gui_window
+ * \param sx receives x ordinate of point at top-left of window
+ * \param sy receives y ordinate of point at top-left of window
+ * \return true iff successful
+ */
+ bool (*get_scroll)(struct gui_window *g, int *sx, int *sy);
+
+ /**
+ * Set the scroll position of a browser window.
+ *
+ * \param g gui_window to scroll
+ * \param sx point to place at top-left of window
+ * \param sy point to place at top-left of window
+ */
+ void (*set_scroll)(struct gui_window *g, int sx, int sy);
+
+ /**
+ * Find the current dimensions of a browser window's content area.
+ *
+ * @todo The implementations of this are buggy and its only
+ * used from frames code.
+ *
+ * \param g gui_window to measure
+ * \param width receives width of window
+ * \param height receives height of window
+ * \param scaled whether to return scaled values
+ */
+ void (*get_dimensions)(struct gui_window *g, int *width, int *height, bool scaled);
+
+ /**
+ * Update the extent of the inside of a browser window to that of the
+ * current content.
+ *
+ * @todo this is used to update scroll bars does it need
+ * renaming? some frontends (windows) do not even implement it.
+ *
+ * \param g gui_window to update the extent of
+ */
+ void (*update_extent)(struct gui_window *g);
+
+ /**
+ * Reformat a window.
+ *
+ * This is used to perform reformats when the page contents
+ * require reformating. The reformat is requested using
+ * browser_window_schedule_reformat and occours via a scheduled
+ * callback hence from top level context.
+ *
+ * \param g gui_window to reformat.
+ */
+ void (*reformat)(struct gui_window *g);
+
+
+ /* Optional entries */
+
+ /**
+ * Set the title of a window.
+ *
+ * \param g window to update
+ * \param title new window title
+ */
+ void (*set_title)(struct gui_window *g, const char *title);
+
+ /**
+ * Set the navigation url.
+ *
+ * \param gw window to update.
+ * \param url The url to use as icon.
+ */
+ nserror (*set_url)(struct gui_window *gw, struct nsurl *url);
+
+ /**
+ * Set a favicon for a gui window.
+ *
+ * \param gw window to update.
+ * \param icon handle to object to use as icon.
+ */
+ void (*set_icon)(struct gui_window *gw, struct hlcache_handle *icon);
+
+ /**
+ * Set the status bar of a browser window.
+ *
+ * \param g gui_window to update
+ * \param text new status text
+ */
+ void (*set_status)(struct gui_window *g, const char *text);
+
+ /**
+ * Change mouse pointer shape
+ */
+ void (*set_pointer)(struct gui_window *g, enum gui_pointer_shape shape);
+
+ /**
+ * Place the caret in a browser window.
+ *
+ * \param g window with caret
+ * \param x coordinates of caret
+ * \param y coordinates of caret
+ * \param height height of caret
+ * \param clip clip rectangle, or NULL if none
+ */
+ void (*place_caret)(struct gui_window *g, int x, int y, int height, const struct rect *clip);
+
+ /**
+ * Remove the caret, if present.
+ *
+ * \param g window with caret
+ */
+ void (*remove_caret)(struct gui_window *g);
+
+ /** start the navigation throbber. */
+ void (*start_throbber)(struct gui_window *g);
+
+ /** stop the navigation throbber. */
+ void (*stop_throbber)(struct gui_window *g);
+
+ /** start a drag operation within a window */
+ bool (*drag_start)(struct gui_window *g, gui_drag_type type, const struct rect *rect);
+
+ /** save link operation */
+ nserror (*save_link)(struct gui_window *g, struct nsurl *url, const char *title);
+
+ /**
+ * Scrolls the specified area of a browser window into view.
+ *
+ * @todo investigate if this can be merged with set_scroll
+ * which is what the default implementation used by most
+ * toolkits uses.
+ *
+ * \param g gui_window to scroll
+ * \param x0 left point to ensure visible
+ * \param y0 bottom point to ensure visible
+ * \param x1 right point to ensure visible
+ * \param y1 top point to ensure visible
+ */
+ void (*scroll_visible)(struct gui_window *g, int x0, int y0, int x1, int y1);
+
+ /**
+ * Starts drag scrolling of a browser window
+ *
+ * \param g the window to scroll
+ */
+ bool (*scroll_start)(struct gui_window *g);
+
+ /**
+ * Called when the gui_window has new content.
+ *
+ * \param g the gui_window that has new content
+ */
+ void (*new_content)(struct gui_window *g);
+
+ /**
+ * create a form select menu
+ */
+ void (*create_form_select_menu)(struct gui_window *gw, struct form_control *control);
+
+ /**
+ * Called when file chooser gadget is activated
+ */
+ void (*file_gadget_open)(struct gui_window *g, struct hlcache_handle *hl, struct form_control *gadget);
+
+ /** object dragged to window*/
+ void (*drag_save_object)(struct gui_window *g, struct hlcache_handle *c, gui_save_type type);
+
+ /** drag selection save */
+ void (*drag_save_selection)(struct gui_window *g, const char *selection);
+
+ /** selection started */
+ void (*start_selection)(struct gui_window *g);
+};
+
+#endif
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=903c4dbef9fae1e24a6...
commit 903c4dbef9fae1e24a66a8ff7b745c799f6726cd
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
move search header into public API
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index 07848ee..0aba197 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -34,7 +34,7 @@
#include "desktop/gui_fetch.h"
#include "desktop/gui_misc.h"
#include "desktop/gui_window.h"
-#include "desktop/gui_search.h"
+#include "netsurf/search.h"
#include "desktop/gui_clipboard.h"
#include "desktop/gui_utf8.h"
#include "desktop/gui_layout.h"
diff --git a/desktop/gui_search.h b/desktop/gui_search.h
deleted file mode 100644
index 0b02ac8..0000000
--- a/desktop/gui_search.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-/**
- * \file
- *
- * Interface to platform-specific search operations.
- */
-
-#ifndef _NETSURF_DESKTOP_GUI_SEARCH_H_
-#define _NETSURF_DESKTOP_GUI_SEARCH_H_
-
-/**
- * function table for page text search.
- */
-struct gui_search_table {
- /**
- * Change the displayed search status.
- *
- * \param found search pattern matched in text
- * \param p gui private data pointer provided with search callbacks
- */
- void (*status)(bool found, void *p);
-
- /**
- * display hourglass while searching.
- *
- * \param active start/stop indicator
- * \param p gui private data pointer provided with search callbacks
- */
- void (*hourglass)(bool active, void *p);
-
- /**
- * add search string to recent searches list
- * front has full liberty how to implement the bare notification;
- * core gives no guarantee of the integrity of the string
- *
- * \param string search pattern
- * \param p gui private data pointer provided with search callbacks
- */
- void (*add_recent)(const char *string, void *p);
-
- /**
- * activate search forwards button in gui
- *
- * \param active activate/inactivate
- * \param p gui private data pointer provided with search callbacks
- */
- void (*forward_state)(bool active, void *p);
-
- /**
- * activate search back button in gui
- *
- * \param active activate/inactivate
- * \param p gui private data pointer provided with search callbacks
- */
- void (*back_state)(bool active, void *p);
-};
-
-#endif
diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c
index 5ca9792..71ed003 100755
--- a/frontends/amiga/search.c
+++ b/frontends/amiga/search.c
@@ -52,7 +52,7 @@
#include "desktop/search.h"
#include "desktop/mouse.h"
#include "desktop/gui_window.h"
-#include "desktop/gui_search.h"
+#include "netsurf/search.h"
#include "amiga/libs.h"
#include "amiga/misc.h"
diff --git a/frontends/atari/search.c b/frontends/atari/search.c
index d72d3ca..11fd67e 100644
--- a/frontends/atari/search.c
+++ b/frontends/atari/search.c
@@ -29,7 +29,7 @@
#include "utils/messages.h"
#include "desktop/browser.h"
#include "desktop/search.h"
-#include "desktop/gui_search.h"
+#include "netsurf/search.h"
#include "atari/gui.h"
#include "atari/rootwin.h"
diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp
index 2e0aa4c..4c0fb51 100644
--- a/frontends/beos/gui.cpp
+++ b/frontends/beos/gui.cpp
@@ -65,7 +65,7 @@ extern "C" {
#include "desktop/browser.h"
#include "desktop/gui_misc.h"
#include "desktop/gui_clipboard.h"
-#include "desktop/gui_search.h"
+#include "netsurf/search.h"
#include "desktop/gui_fetch.h"
#include "desktop/netsurf.h"
diff --git a/frontends/cocoa/SearchWindowController.m b/frontends/cocoa/SearchWindowController.m
index 1c896a9..d07fd04 100644
--- a/frontends/cocoa/SearchWindowController.m
+++ b/frontends/cocoa/SearchWindowController.m
@@ -20,7 +20,7 @@
#import "cocoa/SearchWindowController.h"
#import "cocoa/BrowserViewController.h"
-#import "desktop/gui_search.h"
+#import "netsurf/search.h"
#import "desktop/browser.h"
#import "desktop/search.h"
diff --git a/frontends/gtk/search.c b/frontends/gtk/search.c
index d2adcf1..1124c68 100644
--- a/frontends/gtk/search.c
+++ b/frontends/gtk/search.c
@@ -33,7 +33,7 @@
#include "desktop/browser.h"
#include "desktop/search.h"
#include "desktop/searchweb.h"
-#include "desktop/gui_search.h"
+#include "netsurf/search.h"
#include "gtk/warn.h"
#include "gtk/compat.h"
diff --git a/frontends/riscos/search.c b/frontends/riscos/search.c
index 989c9aa..2e869bb 100644
--- a/frontends/riscos/search.c
+++ b/frontends/riscos/search.c
@@ -34,7 +34,7 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/browser.h"
-#include "desktop/gui_search.h"
+#include "netsurf/search.h"
#include "desktop/browser.h"
#include "desktop/search.h"
diff --git a/include/netsurf/search.h b/include/netsurf/search.h
new file mode 100644
index 0000000..0b02ac8
--- /dev/null
+++ b/include/netsurf/search.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+/**
+ * \file
+ *
+ * Interface to platform-specific search operations.
+ */
+
+#ifndef _NETSURF_DESKTOP_GUI_SEARCH_H_
+#define _NETSURF_DESKTOP_GUI_SEARCH_H_
+
+/**
+ * function table for page text search.
+ */
+struct gui_search_table {
+ /**
+ * Change the displayed search status.
+ *
+ * \param found search pattern matched in text
+ * \param p gui private data pointer provided with search callbacks
+ */
+ void (*status)(bool found, void *p);
+
+ /**
+ * display hourglass while searching.
+ *
+ * \param active start/stop indicator
+ * \param p gui private data pointer provided with search callbacks
+ */
+ void (*hourglass)(bool active, void *p);
+
+ /**
+ * add search string to recent searches list
+ * front has full liberty how to implement the bare notification;
+ * core gives no guarantee of the integrity of the string
+ *
+ * \param string search pattern
+ * \param p gui private data pointer provided with search callbacks
+ */
+ void (*add_recent)(const char *string, void *p);
+
+ /**
+ * activate search forwards button in gui
+ *
+ * \param active activate/inactivate
+ * \param p gui private data pointer provided with search callbacks
+ */
+ void (*forward_state)(bool active, void *p);
+
+ /**
+ * activate search back button in gui
+ *
+ * \param active activate/inactivate
+ * \param p gui private data pointer provided with search callbacks
+ */
+ void (*back_state)(bool active, void *p);
+};
+
+#endif
diff --git a/render/search.c b/render/search.c
index f5e231a..4a1cd2c 100644
--- a/render/search.c
+++ b/render/search.c
@@ -33,7 +33,7 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/selection.h"
-#include "desktop/gui_search.h"
+#include "netsurf/search.h"
#include "desktop/gui_misc.h"
#include "desktop/gui_internal.h"
-----------------------------------------------------------------------
Summary of changes:
content/content.c | 3 +-
content/content.h | 2 +-
content/fetch.c | 2 +-
content/fetchers/curl.c | 4 +-
content/fetchers/file.c | 2 +-
content/fetchers/resource.c | 2 +-
content/fs_backing_store.c | 2 +-
content/handlers/image/bmp.c | 2 +-
content/handlers/image/gif.c | 2 +-
content/handlers/image/image.c | 2 +-
content/handlers/image/image_cache.c | 2 +-
content/handlers/image/nssprite.c | 2 +-
content/handlers/image/rsvg.c | 2 +-
content/handlers/image/svg.c | 2 +-
content/hlcache.c | 2 +-
content/llcache.c | 2 +-
desktop/browser.c | 58 ++++++++++----------
desktop/browser_history.c | 4 +-
desktop/browser_private.h | 4 +-
desktop/download.c | 2 +-
desktop/frame_types.h | 5 +-
desktop/frames.h | 2 +
desktop/global_history.c | 2 +-
desktop/gui_factory.c | 20 +++----
desktop/hotlist.c | 4 +-
desktop/knockout.c | 2 +-
desktop/knockout.h | 2 +-
desktop/mouse.c | 2 +-
desktop/netsurf.c | 8 +--
desktop/plot_style.c | 2 +-
desktop/print.c | 2 +-
desktop/save_complete.c | 2 +-
desktop/save_pdf.c | 2 +-
desktop/save_text.c | 2 +-
desktop/scrollbar.c | 6 +-
desktop/selection.c | 8 +--
desktop/selection.h | 2 +-
desktop/sslcert_viewer.h | 2 +-
desktop/textarea.c | 10 ++--
desktop/textarea.h | 4 ++
desktop/textinput.c | 4 +-
desktop/tree.c | 4 +-
desktop/tree.h | 2 +-
desktop/treeview.c | 6 +-
desktop/treeview.h | 2 +-
frontends/amiga/arexx.c | 4 +-
frontends/amiga/bitmap.c | 4 +-
frontends/amiga/clipboard.c | 8 +--
frontends/amiga/cookies.c | 4 +-
frontends/amiga/ctxmenu.c | 4 +-
frontends/amiga/download.c | 8 +--
frontends/amiga/drag.c | 2 +-
frontends/amiga/drag.h | 4 +-
frontends/amiga/dt_anim.c | 2 +-
frontends/amiga/dt_picture.c | 2 +-
frontends/amiga/dt_sound.c | 2 +-
frontends/amiga/file.c | 4 +-
frontends/amiga/font.c | 4 +-
frontends/amiga/font.h | 2 +-
frontends/amiga/font_scan.c | 4 +-
frontends/amiga/gui.c | 12 ++--
frontends/amiga/gui.h | 4 +-
frontends/amiga/gui_options.c | 4 +-
frontends/amiga/history.c | 4 +-
frontends/amiga/history_local.c | 6 +-
frontends/amiga/hotlist.c | 4 +-
frontends/amiga/icon.c | 2 +-
frontends/amiga/login.c | 4 +-
frontends/amiga/menu.c | 6 +-
frontends/amiga/misc.c | 2 +-
frontends/amiga/plotters.c | 4 +-
frontends/amiga/plotters.h | 2 +-
frontends/amiga/plugin_hack.c | 2 +-
frontends/amiga/print.c | 8 +--
frontends/amiga/search.c | 8 +--
frontends/amiga/selectmenu.c | 2 +-
frontends/amiga/sslcert.c | 4 +-
frontends/amiga/theme.c | 4 +-
frontends/amiga/tree.c | 4 +-
frontends/amiga/utf8.c | 2 +-
frontends/atari/about.c | 2 +-
frontends/atari/bitmap.c | 2 +-
frontends/atari/cookies.c | 4 +-
frontends/atari/ctxmenu.c | 2 +-
frontends/atari/deskmenu.c | 2 +-
frontends/atari/download.c | 4 +-
frontends/atari/encoding.c | 2 +-
frontends/atari/font.c | 6 +-
frontends/atari/gui.c | 14 ++---
frontends/atari/gui.h | 2 +-
frontends/atari/history.c | 2 +-
frontends/atari/misc.c | 2 +-
frontends/atari/plot/font_freetype.c | 2 +-
frontends/atari/plot/font_internal.c | 2 +-
frontends/atari/plot/fontplot.c | 2 +-
frontends/atari/plot/plot.c | 4 +-
frontends/atari/rootwin.c | 6 +-
frontends/atari/search.c | 4 +-
frontends/atari/statusbar.c | 4 +-
frontends/atari/toolbar.c | 6 +-
frontends/atari/treeview.c | 4 +-
frontends/beos/about.cpp | 2 +-
frontends/beos/bitmap.cpp | 4 +-
frontends/beos/cookies.cpp | 4 +-
frontends/beos/download.cpp | 2 +-
frontends/beos/font.cpp | 2 +-
frontends/beos/gui.cpp | 12 ++--
frontends/beos/login.cpp | 4 +-
frontends/beos/plotters.cpp | 2 +-
frontends/beos/scaffolding.cpp | 8 +--
frontends/beos/schedule.cpp | 2 +-
frontends/beos/window.cpp | 10 ++--
frontends/cocoa/BookmarksController.m | 2 +-
frontends/cocoa/BrowserView.m | 4 +-
frontends/cocoa/BrowserViewController.m | 2 +-
frontends/cocoa/BrowserWindowController.m | 2 +-
frontends/cocoa/DownloadWindowController.m | 2 +-
frontends/cocoa/FormSelectMenu.m | 2 +-
frontends/cocoa/HistoryView.m | 2 +-
frontends/cocoa/NetSurfAppDelegate.m | 2 +-
frontends/cocoa/NetsurfApp.m | 6 +-
frontends/cocoa/PreferencesWindowController.m | 2 +-
frontends/cocoa/SearchWindowController.m | 4 +-
frontends/cocoa/Tree.m | 2 +-
frontends/cocoa/TreeView.m | 2 +-
frontends/cocoa/apple_image.m | 2 +-
frontends/cocoa/bitmap.m | 4 +-
frontends/cocoa/coordinates.h | 2 +-
frontends/cocoa/fetch.m | 2 +-
frontends/cocoa/font.m | 4 +-
frontends/cocoa/gui.m | 8 +--
frontends/cocoa/plotter.m | 4 +-
frontends/cocoa/selection.m | 2 +-
frontends/framebuffer/bitmap.c | 2 +-
frontends/framebuffer/clipboard.c | 4 +-
frontends/framebuffer/fbtk/bitmap.c | 2 +-
frontends/framebuffer/fbtk/event.c | 2 +-
frontends/framebuffer/fbtk/fbtk.c | 4 +-
frontends/framebuffer/fbtk/fill.c | 2 +-
frontends/framebuffer/fbtk/osk.c | 2 +-
frontends/framebuffer/fbtk/scroll.c | 2 +-
frontends/framebuffer/fbtk/text.c | 4 +-
frontends/framebuffer/fbtk/window.c | 2 +-
frontends/framebuffer/fetch.c | 2 +-
frontends/framebuffer/font_freetype.c | 6 +-
frontends/framebuffer/font_internal.c | 4 +-
frontends/framebuffer/framebuffer.c | 4 +-
frontends/framebuffer/gui.c | 10 ++--
frontends/framebuffer/localhistory.c | 2 +-
frontends/gtk/about.c | 2 +-
frontends/gtk/bitmap.c | 2 +-
frontends/gtk/completion.c | 2 +-
frontends/gtk/download.c | 2 +-
frontends/gtk/fetch.c | 2 +-
frontends/gtk/gui.c | 6 +-
frontends/gtk/layout_pango.c | 2 +-
frontends/gtk/plotters.c | 2 +-
frontends/gtk/preferences.c | 2 +-
frontends/gtk/print.c | 2 +-
frontends/gtk/scaffolding.c | 4 +-
frontends/gtk/search.c | 4 +-
frontends/gtk/selection.c | 4 +-
frontends/gtk/tabs.c | 2 +-
frontends/gtk/toolbar.c | 2 +-
frontends/gtk/treeview.c | 2 +-
frontends/gtk/viewdata.c | 2 +-
frontends/gtk/viewsource.c | 2 +-
frontends/gtk/window.c | 8 +--
frontends/monkey/browser.c | 8 +--
frontends/monkey/download.c | 2 +-
frontends/monkey/fetch.c | 2 +-
frontends/monkey/layout.c | 2 +-
frontends/monkey/main.c | 4 +-
frontends/monkey/plot.c | 2 +-
frontends/riscos/401login.c | 1 -
frontends/riscos/bitmap.c | 2 +-
frontends/riscos/content-handlers/artworks.c | 2 +-
frontends/riscos/content-handlers/draw.c | 2 +-
frontends/riscos/content-handlers/sprite.c | 2 +-
frontends/riscos/dialog.c | 2 +-
frontends/riscos/download.c | 4 +-
frontends/riscos/font.c | 2 +-
frontends/riscos/global_history.c | 2 +-
frontends/riscos/gui.c | 8 +--
frontends/riscos/gui/progress_bar.c | 2 +-
frontends/riscos/gui/status_bar.c | 2 +-
frontends/riscos/gui/url_bar.c | 4 +-
frontends/riscos/help.c | 4 +-
frontends/riscos/history.c | 2 +-
frontends/riscos/hotlist.c | 2 +-
frontends/riscos/iconbar.c | 7 ++-
frontends/riscos/menus.c | 1 -
frontends/riscos/plotters.c | 2 +-
frontends/riscos/print.c | 4 +-
frontends/riscos/save.c | 4 +-
frontends/riscos/save_draw.c | 2 +-
frontends/riscos/search.c | 5 +-
frontends/riscos/sslcert.c | 1 -
frontends/riscos/textarea.c | 1 -
frontends/riscos/textselection.c | 13 +++--
frontends/riscos/theme_install.c | 1 -
frontends/riscos/toolbar.c | 1 -
frontends/riscos/treeview.c | 3 +-
frontends/riscos/ucstables.c | 2 +-
frontends/riscos/uri.c | 7 ++-
frontends/riscos/url_complete.c | 7 ++-
frontends/riscos/url_protocol.c | 7 ++-
frontends/riscos/window.c | 8 +--
frontends/windows/bitmap.c | 2 +-
frontends/windows/download.c | 2 +-
frontends/windows/drawable.c | 4 +-
frontends/windows/file.c | 2 +-
frontends/windows/filetype.c | 2 +-
frontends/windows/font.c | 4 +-
frontends/windows/gui.c | 4 +-
frontends/windows/localhistory.c | 2 +-
frontends/windows/main.c | 8 +--
frontends/windows/plot.c | 6 +-
frontends/windows/pointers.c | 4 +-
frontends/windows/window.c | 4 +-
frontends/windows/window.h | 2 +-
.../browser.h => include/netsurf/browser_window.h | 13 ++---
.../gui_clipboard.h => include/netsurf/clipboard.h | 4 +-
include/netsurf/css.h | 4 +-
.../gui_download.h => include/netsurf/download.h | 4 +-
desktop/gui_fetch.h => include/netsurf/fetch.h | 4 +-
desktop/gui_layout.h => include/netsurf/layout.h | 4 +-
desktop/gui_misc.h => include/netsurf/misc.h | 4 +-
{desktop => include/netsurf}/mouse.h | 37 +++++++++----
{desktop => include/netsurf}/netsurf.h | 4 +-
{desktop => include/netsurf}/plotters.h | 9 +--
desktop/gui_search.h => include/netsurf/search.h | 4 +-
desktop/gui_utf8.h => include/netsurf/utf8.h | 4 +-
desktop/gui_window.h => include/netsurf/window.h | 4 +-
javascript/duktape/Location.bnd | 2 +-
javascript/duktape/Window.bnd | 2 +-
javascript/jsapi/location.bnd | 2 +-
render/box.c | 2 +-
render/box_construct.c | 2 +-
render/box_textarea.c | 1 -
render/form.c | 8 +--
render/html.c | 8 +--
render/html.h | 4 +-
render/html_css.c | 2 +-
render/html_forms.c | 2 -
render/html_interaction.c | 8 +--
render/html_object.c | 2 +-
render/html_redraw.c | 6 +-
render/layout.c | 4 +-
render/search.c | 4 +-
render/textplain.c | 6 +-
render/textplain.h | 2 +-
test/Makefile | 2 +-
utils/utf8.c | 2 +-
254 files changed, 515 insertions(+), 496 deletions(-)
rename desktop/browser.h => include/netsurf/browser_window.h (98%)
rename desktop/gui_clipboard.h => include/netsurf/clipboard.h (95%)
rename desktop/gui_download.h => include/netsurf/download.h (93%)
rename desktop/gui_fetch.h => include/netsurf/fetch.h (97%)
rename desktop/gui_layout.h => include/netsurf/layout.h (97%)
rename desktop/gui_misc.h => include/netsurf/misc.h (97%)
rename {desktop => include/netsurf}/mouse.h (88%)
rename {desktop => include/netsurf}/netsurf.h (95%)
rename {desktop => include/netsurf}/plotters.h (97%)
rename desktop/gui_search.h => include/netsurf/search.h (96%)
rename desktop/gui_utf8.h => include/netsurf/utf8.h (95%)
rename desktop/gui_window.h => include/netsurf/window.h (99%)
diff --git a/content/content.c b/content/content.c
index ad130a5..888202e 100644
--- a/content/content.c
+++ b/content/content.c
@@ -28,10 +28,9 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/plotters.h"
#include "desktop/knockout.h"
#include "desktop/gui_internal.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/bitmap.h"
#include "content/content_protected.h"
diff --git a/content/content.h b/content/content.h
index cdd7283..1c75077 100644
--- a/content/content.h
+++ b/content/content.h
@@ -32,7 +32,7 @@
#include "content/content_factory.h"
#include "content/content_type.h"
#include "desktop/search.h" /* search flags enum */
-#include "desktop/mouse.h" /* mouse state enums */
+#include "netsurf/mouse.h" /* mouse state enums */
#include "desktop/plot_style.h" /* color typedef */
struct browser_window;
diff --git a/content/fetch.c b/content/fetch.c
index 9c2933b..c5928ba 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -49,7 +49,7 @@
#include "utils/nsurl.h"
#include "utils/utils.h"
#include "utils/ring.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "content/fetch.h"
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index b94a3f2..9ac390c 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -52,8 +52,8 @@
#include "utils/useragent.h"
#include "utils/file.h"
#include "utils/string.h"
-#include "desktop/gui_fetch.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/fetch.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "content/fetch.h"
diff --git a/content/fetchers/file.c b/content/fetchers/file.c
index 8cfe3a0..04184d2 100644
--- a/content/fetchers/file.c
+++ b/content/fetchers/file.c
@@ -49,7 +49,7 @@
#include "utils/utils.h"
#include "utils/ring.h"
#include "utils/file.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "desktop/gui_internal.h"
#include "content/dirlist.h"
diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c
index 72ed887..21ad8c7 100644
--- a/content/fetchers/resource.c
+++ b/content/fetchers/resource.c
@@ -35,7 +35,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "utils/ring.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "desktop/gui_internal.h"
#include "content/fetch.h"
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index 0c76596..7d8ac4b 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -50,7 +50,7 @@
#include "utils/utils.h"
#include "utils/messages.h"
#include "desktop/gui_internal.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "content/backing_store.h"
diff --git a/content/handlers/image/bmp.c b/content/handlers/image/bmp.c
index e108b48..114a551 100644
--- a/content/handlers/image/bmp.c
+++ b/content/handlers/image/bmp.c
@@ -30,7 +30,7 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/bitmap.h"
#include "bmp.h"
diff --git a/content/handlers/image/gif.c b/content/handlers/image/gif.c
index 1167266..93970f9 100644
--- a/content/handlers/image/gif.c
+++ b/content/handlers/image/gif.c
@@ -40,7 +40,7 @@
#include "utils/messages.h"
#include "utils/nsoption.h"
#include "content/content_protected.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "netsurf/bitmap.h"
diff --git a/content/handlers/image/image.c b/content/handlers/image/image.c
index 487b35b..da5eea1 100644
--- a/content/handlers/image/image.c
+++ b/content/handlers/image/image.c
@@ -23,7 +23,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "content/content.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/gui_internal.h"
#include "netsurf/bitmap.h"
diff --git a/content/handlers/image/image_cache.c b/content/handlers/image/image_cache.c
index 52b3b34..4c008b7 100644
--- a/content/handlers/image/image_cache.c
+++ b/content/handlers/image/image_cache.c
@@ -26,7 +26,7 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "content/content_protected.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "netsurf/bitmap.h"
diff --git a/content/handlers/image/nssprite.c b/content/handlers/image/nssprite.c
index 082bf9e..8912f83 100644
--- a/content/handlers/image/nssprite.c
+++ b/content/handlers/image/nssprite.c
@@ -30,7 +30,7 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/bitmap.h"
#include "nssprite.h"
diff --git a/content/handlers/image/rsvg.c b/content/handlers/image/rsvg.c
index dce1ea9..9842d45 100644
--- a/content/handlers/image/rsvg.c
+++ b/content/handlers/image/rsvg.c
@@ -42,7 +42,7 @@
#include "utils/utils.h"
#include "utils/messages.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/gui_internal.h"
#include "netsurf/bitmap.h"
diff --git a/content/handlers/image/svg.c b/content/handlers/image/svg.c
index 3eff684..82c85ac 100644
--- a/content/handlers/image/svg.c
+++ b/content/handlers/image/svg.c
@@ -30,7 +30,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "svg.h"
diff --git a/content/hlcache.c b/content/hlcache.c
index 06d9f6d..65210d5 100644
--- a/content/hlcache.c
+++ b/content/hlcache.c
@@ -29,7 +29,7 @@
#include "utils/messages.h"
#include "utils/ring.h"
#include "utils/utils.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "content/content.h"
diff --git a/content/llcache.c b/content/llcache.c
index 9381ce9..33a9b98 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -47,7 +47,7 @@
#include "utils/nsurl.h"
#include "utils/utils.h"
#include "utils/time.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "content/fetch.h"
diff --git a/desktop/browser.c b/desktop/browser.c
index 2ee36fd..c0db76a 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -68,10 +68,10 @@
#include "desktop/knockout.h"
#include "desktop/scrollbar.h"
#include "desktop/selection.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/theme.h"
-#include "desktop/gui_misc.h"
-#include "desktop/gui_window.h"
+#include "netsurf/misc.h"
+#include "netsurf/window.h"
#include "desktop/gui_internal.h"
@@ -497,7 +497,7 @@ char * browser_window_get_selection(struct browser_window *bw)
return content_get_selection(bw->selection.bw->current_content);
}
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
bool browser_window_can_search(struct browser_window *bw)
{
if (bw == NULL || bw->current_content == NULL)
@@ -515,14 +515,14 @@ bool browser_window_can_search(struct browser_window *bw)
}
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
bool browser_window_is_frameset(struct browser_window *bw)
{
return (bw->children != NULL);
}
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
nserror browser_window_get_scrollbar_type(struct browser_window *bw,
browser_scrolling *h, browser_scrolling *v)
{
@@ -762,7 +762,7 @@ bool browser_window_drop_file_at_point(struct browser_window *bw,
return false;
}
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
void browser_window_set_gadget_filename(struct browser_window *bw,
struct form_control *gadget, const char *fn)
{
@@ -802,7 +802,7 @@ static bool slow_script(void *ctx)
return true;
}
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
nserror browser_window_create(enum browser_window_create_flags flags,
nsurl *url, nsurl *referrer,
struct browser_window *existing,
@@ -1872,7 +1872,7 @@ browser_window_refresh_url_bar_internal(struct browser_window *bw, nsurl *url)
}
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
void browser_window_destroy(struct browser_window *bw)
{
/* can't destoy child windows on their own */
@@ -1883,7 +1883,7 @@ void browser_window_destroy(struct browser_window *bw)
free(bw);
}
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
nserror browser_window_refresh_url_bar(struct browser_window *bw)
{
nserror ret;
@@ -1919,7 +1919,7 @@ nserror browser_window_refresh_url_bar(struct browser_window *bw)
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
nserror browser_window_navigate(struct browser_window *bw,
nsurl *url,
nsurl *referrer,
@@ -2343,7 +2343,7 @@ void browser_window_update(struct browser_window *bw, bool scroll_to_top)
}
}
-/* Exported interface, documented in desktop/browser.h */
+/* Exported interface, documented in netsurf/browser_window.h */
void browser_window_update_box(struct browser_window *bw, struct rect *rect)
{
int pos_x;
@@ -2370,7 +2370,7 @@ void browser_window_update_box(struct browser_window *bw, struct rect *rect)
}
}
-/* Exported interface, documented in desktop/browser.h */
+/* Exported interface, documented in netsurf/browser_window.h */
void browser_window_stop(struct browser_window *bw)
{
int children, index;
@@ -2411,7 +2411,7 @@ void browser_window_stop(struct browser_window *bw)
}
-/* Exported interface, documented in desktop/browser.h */
+/* Exported interface, documented in netsurf/browser_window.h */
void browser_window_reload(struct browser_window *bw, bool all)
{
hlcache_handle *c;
@@ -2457,7 +2457,7 @@ void browser_window_reload(struct browser_window *bw, bool all)
}
-/* Exported interface, documented in desktop/browser.h */
+/* Exported interface, documented in netsurf/browser_window.h */
void browser_window_set_status(struct browser_window *bw, const char *text)
{
int text_len;
@@ -2491,7 +2491,7 @@ void browser_window_set_status(struct browser_window *bw, const char *text)
}
-/* Exported interface, documented in desktop/browser.h */
+/* Exported interface, documented in netsurf/browser_window.h */
void browser_window_set_pointer(struct browser_window *bw,
browser_pointer_shape shape)
{
@@ -2530,7 +2530,7 @@ void browser_window_set_pointer(struct browser_window *bw,
guit->window->set_pointer(root->window, gui_shape);
}
-/* exported function documented in desktop/browser.h */
+/* exported function documented in netsurf/browser_window.h */
nserror browser_window_schedule_reformat(struct browser_window *bw)
{
/* The ugly cast here is so the reformat function can be
@@ -2541,7 +2541,7 @@ nserror browser_window_schedule_reformat(struct browser_window *bw)
}
-/* exported function documented in desktop/browser.h */
+/* exported function documented in netsurf/browser_window.h */
void browser_window_reformat(struct browser_window *bw, bool background,
int width, int height)
{
@@ -2601,7 +2601,7 @@ static void browser_window_set_scale_internal(struct browser_window *bw,
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
void browser_window_set_scale(struct browser_window *bw, float scale, bool all)
{
while (bw->parent && all)
@@ -2616,7 +2616,7 @@ void browser_window_set_scale(struct browser_window *bw, float scale, bool all)
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
float browser_window_get_scale(struct browser_window *bw)
{
if (bw == NULL) {
@@ -2681,7 +2681,7 @@ static void browser_window_find_target_internal(struct browser_window *bw,
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
struct browser_window *browser_window_find_target(struct browser_window *bw,
const char *target, browser_mouse_state mouse)
{
@@ -2875,7 +2875,7 @@ static void browser_window_mouse_drag_end(struct browser_window *bw,
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
void browser_window_mouse_track(struct browser_window *bw,
browser_mouse_state mouse, int x, int y)
{
@@ -3023,7 +3023,7 @@ void browser_window_mouse_track(struct browser_window *bw,
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
void browser_window_mouse_click(struct browser_window *bw,
browser_mouse_state mouse, int x, int y)
{
@@ -3148,7 +3148,7 @@ void browser_window_mouse_click(struct browser_window *bw,
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
void browser_window_redraw_rect(struct browser_window *bw, int x, int y,
int width, int height)
{
@@ -3156,7 +3156,7 @@ void browser_window_redraw_rect(struct browser_window *bw, int x, int y,
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
void browser_window_page_drag_start(struct browser_window *bw, int x, int y)
{
assert(bw != NULL);
@@ -3181,7 +3181,7 @@ void browser_window_page_drag_start(struct browser_window *bw, int x, int y)
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
bool browser_window_back_available(struct browser_window *bw)
{
return (bw && bw->history &&
@@ -3190,21 +3190,21 @@ bool browser_window_back_available(struct browser_window *bw)
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
bool browser_window_forward_available(struct browser_window *bw)
{
return (bw && bw->history &&
browser_window_history_forward_available(bw));
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
bool browser_window_reload_available(struct browser_window *bw)
{
return (bw && bw->current_content && !bw->loading_content);
}
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
bool browser_window_stop_available(struct browser_window *bw)
{
return (bw && (bw->loading_content ||
diff --git a/desktop/browser_history.c b/desktop/browser_history.c
index 871cc3e..a8c8ee0 100644
--- a/desktop/browser_history.c
+++ b/desktop/browser_history.c
@@ -36,11 +36,11 @@
#include "content/urldb.h"
#include "netsurf/bitmap.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "desktop/gui_internal.h"
#include "desktop/browser_history.h"
#include "desktop/browser_private.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#define WIDTH 100
#define HEIGHT 86
diff --git a/desktop/browser_private.h b/desktop/browser_private.h
index efd875f..2641a0e 100644
--- a/desktop/browser_private.h
+++ b/desktop/browser_private.h
@@ -26,8 +26,8 @@
#include <libwapcaplet/libwapcaplet.h>
-#include "desktop/browser.h"
-
+#include "netsurf/browser_window.h"
+#include "desktop/frame_types.h"
struct box;
struct hlcache_handle;
diff --git a/desktop/download.c b/desktop/download.c
index 131bc80..76c2949 100644
--- a/desktop/download.c
+++ b/desktop/download.c
@@ -30,7 +30,7 @@
#include "utils/http.h"
#include "utils/utils.h"
#include "desktop/download.h"
-#include "desktop/gui_download.h"
+#include "netsurf/download.h"
#include "desktop/gui_internal.h"
/**
diff --git a/desktop/frame_types.h b/desktop/frame_types.h
index 7008e98..416c888 100644
--- a/desktop/frame_types.h
+++ b/desktop/frame_types.h
@@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Browser window creation and manipulation (interface).
+/**
+ * \file
+ * Interface to browser frames.
*/
#ifndef _NETSURF_DESKTOP_FRAME_TYPES_H_
diff --git a/desktop/frames.h b/desktop/frames.h
index b39c8a8..063e2c5 100644
--- a/desktop/frames.h
+++ b/desktop/frames.h
@@ -24,6 +24,8 @@
#define _NETSURF_DESKTOP_FRAMES_H_
struct scrollbar_msg_data;
+struct content_html_iframe;
+struct content_html_frames;
/**
* Create and open iframes for a browser window.
diff --git a/desktop/global_history.c b/desktop/global_history.c
index 9fa1d6d..01b7dee 100644
--- a/desktop/global_history.c
+++ b/desktop/global_history.c
@@ -29,7 +29,7 @@
#include "desktop/global_history.h"
#include "desktop/treeview.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#define N_DAYS 28
#define N_SEC_PER_DAY (60 * 60 * 24)
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index 07848ee..cecbe6e 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -30,15 +30,15 @@
#include "desktop/save_pdf.h"
#include "desktop/download.h"
#include "desktop/searchweb.h"
-#include "desktop/gui_download.h"
-#include "desktop/gui_fetch.h"
-#include "desktop/gui_misc.h"
-#include "desktop/gui_window.h"
-#include "desktop/gui_search.h"
-#include "desktop/gui_clipboard.h"
-#include "desktop/gui_utf8.h"
-#include "desktop/gui_layout.h"
-#include "desktop/netsurf.h"
+#include "netsurf/download.h"
+#include "netsurf/fetch.h"
+#include "netsurf/misc.h"
+#include "netsurf/window.h"
+#include "netsurf/search.h"
+#include "netsurf/clipboard.h"
+#include "netsurf/utf8.h"
+#include "netsurf/layout.h"
+#include "netsurf/netsurf.h"
/**
* The global interface table.
@@ -743,7 +743,7 @@ static nserror verify_misc_register(struct gui_misc_table *gmt)
}
-/* exported interface documented in desktop/netsurf.h */
+/* exported interface documented in netsurf/netsurf.h */
nserror netsurf_register(struct netsurf_table *gt)
{
nserror err;
diff --git a/desktop/hotlist.c b/desktop/hotlist.c
index 98d5f9c..eae5ad8 100644
--- a/desktop/hotlist.c
+++ b/desktop/hotlist.c
@@ -33,11 +33,11 @@
#include "utils/log.h"
#include "content/urldb.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "desktop/hotlist.h"
#include "desktop/treeview.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#define N_DAYS 28
#define N_SEC_PER_DAY (60 * 60 * 24)
diff --git a/desktop/knockout.c b/desktop/knockout.c
index a20ec28..b930ef6 100644
--- a/desktop/knockout.c
+++ b/desktop/knockout.c
@@ -74,7 +74,7 @@
#include "desktop/gui_internal.h"
#include "desktop/knockout.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
/* Define to enable knockout debug */
#undef KNOCKOUT_DEBUG
diff --git a/desktop/knockout.h b/desktop/knockout.h
index a6b61d8..c4f1245 100644
--- a/desktop/knockout.h
+++ b/desktop/knockout.h
@@ -23,7 +23,7 @@
#ifndef _NETSURF_DESKTOP_KNOCKOUT_H_
#define _NETSURF_DESKTOP_KNOCKOUT_H_
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
bool knockout_plot_start(const struct redraw_context *ctx,
diff --git a/desktop/mouse.c b/desktop/mouse.c
index ea627ac..6d22fd4 100644
--- a/desktop/mouse.c
+++ b/desktop/mouse.c
@@ -20,7 +20,7 @@
* Browser window creation and manipulation (implementation).
*/
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "utils/log.h"
/**
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index d3d45ca..1ca2ea9 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -44,12 +44,12 @@
#include "render/html.h"
#include "render/textplain.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/system_colour.h"
#include "desktop/searchweb.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
/** speculative pre-conversion small image size
*
@@ -121,7 +121,7 @@ static nserror netsurf_llcache_query_handler(const llcache_query *query,
return NSERROR_OK;
}
-/* exported interface documented in desktop/netsurf.h */
+/* exported interface documented in netsurf/netsurf.h */
nserror netsurf_init(const char *store_path)
{
nserror ret;
diff --git a/desktop/plot_style.c b/desktop/plot_style.c
index 05e42ba..f9ba4bc 100644
--- a/desktop/plot_style.c
+++ b/desktop/plot_style.c
@@ -23,7 +23,7 @@
* These plot styles are globaly available and used in many places.
*/
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
static plot_style_t plot_style_fill_white_static = {
.fill_type = PLOT_OP_TYPE_SOLID,
diff --git a/desktop/print.c b/desktop/print.c
index c3cfefc..8daec88 100644
--- a/desktop/print.c
+++ b/desktop/print.c
@@ -35,7 +35,7 @@
#include "content/handlers/css/utils.h"
#include "render/box.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/print.h"
#include "desktop/printer.h"
diff --git a/desktop/save_complete.c b/desktop/save_complete.c
index 6f63960..201e80b 100644
--- a/desktop/save_complete.c
+++ b/desktop/save_complete.c
@@ -45,7 +45,7 @@
#include "render/box.h"
#include "render/html.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "desktop/save_complete.h"
diff --git a/desktop/save_pdf.c b/desktop/save_pdf.c
index 0c870b4..d303eca 100644
--- a/desktop/save_pdf.c
+++ b/desktop/save_pdf.c
@@ -62,7 +62,7 @@
#include "utils/nsoption.h"
#include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/print.h"
#include "desktop/printer.h"
diff --git a/desktop/save_text.c b/desktop/save_text.c
index 81c3db6..dee1c91 100644
--- a/desktop/save_text.c
+++ b/desktop/save_text.c
@@ -36,7 +36,7 @@
#include "render/box.h"
#include "render/html.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/utf8.h"
#include "desktop/gui_internal.h"
#include "desktop/save_text.h"
diff --git a/desktop/scrollbar.c b/desktop/scrollbar.c
index 82fcac1..b9e963a 100644
--- a/desktop/scrollbar.c
+++ b/desktop/scrollbar.c
@@ -30,11 +30,11 @@
#include "utils/utils.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/system_colour.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/scrollbar.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/plot_style.h"
diff --git a/desktop/selection.c b/desktop/selection.c
index e2bd747..b2c7837 100644
--- a/desktop/selection.c
+++ b/desktop/selection.c
@@ -37,13 +37,13 @@
#include "render/font.h"
#include "render/textplain.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/browser_private.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/save_text.h"
#include "desktop/selection.h"
-#include "desktop/gui_clipboard.h"
-#include "desktop/gui_window.h"
+#include "netsurf/clipboard.h"
+#include "netsurf/window.h"
#include "desktop/gui_internal.h"
/**
diff --git a/desktop/selection.h b/desktop/selection.h
index 7e620fc..e2bc3b3 100644
--- a/desktop/selection.h
+++ b/desktop/selection.h
@@ -24,7 +24,7 @@
#define _NETSURF_DESKTOP_SELECTION_H_
#include <stdbool.h>
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
struct box;
diff --git a/desktop/sslcert_viewer.h b/desktop/sslcert_viewer.h
index 92f402f..f7c8f33 100644
--- a/desktop/sslcert_viewer.h
+++ b/desktop/sslcert_viewer.h
@@ -22,7 +22,7 @@
#define _NETSURF_DESKTOP_SSLCERT_VIEWER_H_
#include "content/llcache.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
struct sslcert_session_data;
struct redraw_context;
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 96a1713..5d18709 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -31,14 +31,14 @@
#include "utils/utils.h"
#include "content/handlers/css/utils.h"
-#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/mouse.h"
#include "desktop/textarea.h"
#include "desktop/textinput.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/scrollbar.h"
-#include "desktop/gui_clipboard.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/clipboard.h"
+#include "netsurf/layout.h"
#include "desktop/gui_internal.h"
#define CARET_COLOR 0x0000FF
diff --git a/desktop/textarea.h b/desktop/textarea.h
index 66d5cbc..74652f3 100644
--- a/desktop/textarea.h
+++ b/desktop/textarea.h
@@ -29,7 +29,11 @@
#include "utils/utils.h"
+#include "desktop/plot_style.h"
+#include "netsurf/mouse.h"
+
struct textarea;
+struct redraw_context;
/* Text area flags */
typedef enum {
diff --git a/desktop/textinput.c b/desktop/textinput.c
index bd51d5a..0e98e03 100644
--- a/desktop/textinput.c
+++ b/desktop/textinput.c
@@ -38,10 +38,10 @@
#include "render/html_internal.h"
#include "render/layout.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/browser_private.h"
#include "desktop/textinput.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_internal.h"
/* Define to enable textinput debug */
diff --git a/desktop/tree.c b/desktop/tree.c
index e9a2dfd..d1af766 100644
--- a/desktop/tree.c
+++ b/desktop/tree.c
@@ -34,7 +34,7 @@
#include "content/hlcache.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/tree.h"
struct tree {
@@ -44,7 +44,7 @@ struct tree {
void *client_data; /* User assigned data for the callbacks */
};
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "desktop/treeview.h"
#include "desktop/hotlist.h"
diff --git a/desktop/tree.h b/desktop/tree.h
index b4e0f66..f8864e1 100644
--- a/desktop/tree.h
+++ b/desktop/tree.h
@@ -27,7 +27,7 @@
#include <stdbool.h>
#include <stdint.h>
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
struct sslcert_session_data;
struct tree;
diff --git a/desktop/treeview.c b/desktop/treeview.c
index ec2a513..4fa0544 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -29,11 +29,11 @@
#include "desktop/system_colour.h"
#include "desktop/knockout.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/textarea.h"
#include "desktop/treeview.h"
-#include "desktop/gui_clipboard.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/clipboard.h"
+#include "netsurf/layout.h"
#include "desktop/gui_internal.h"
/** @todo get rid of REDRAW_MAX -- need to be able to know window size */
diff --git a/desktop/treeview.h b/desktop/treeview.h
index d4d4ce9..5369569 100644
--- a/desktop/treeview.h
+++ b/desktop/treeview.h
@@ -26,7 +26,7 @@
#include <stdbool.h>
#include <stdint.h>
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/core_window.h"
#include "desktop/textinput.h"
diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c
index c5b5ab4..8436fdc 100644
--- a/frontends/amiga/arexx.c
+++ b/frontends/amiga/arexx.c
@@ -34,8 +34,8 @@
#include "utils/nsoption.h"
#include "utils/nsurl.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
-#include "desktop/gui_window.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/window.h"
#include "desktop/version.h"
#include "amiga/arexx.h"
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index cf342d8..791295f 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -48,8 +48,8 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "content/hlcache.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
#include "netsurf/bitmap.h"
#include "amiga/gui.h"
diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c
index 12ceb0f..bcdc51c 100644
--- a/frontends/amiga/clipboard.c
+++ b/frontends/amiga/clipboard.c
@@ -31,11 +31,11 @@
#include "utils/utf8.h"
#include "utils/nsurl.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
-#include "desktop/plotters.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/plotters.h"
#include "desktop/textinput.h"
-#include "desktop/gui_window.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/window.h"
+#include "netsurf/clipboard.h"
#include "amiga/bitmap.h"
#include "amiga/clipboard.h"
diff --git a/frontends/amiga/cookies.c b/frontends/amiga/cookies.c
index 0ca1741..c775c83 100755
--- a/frontends/amiga/cookies.c
+++ b/frontends/amiga/cookies.c
@@ -19,8 +19,8 @@
#include <proto/exec.h>
#include "desktop/cookie_manager.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
#include "amiga/cookies.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/ctxmenu.c b/frontends/amiga/ctxmenu.c
index cc612da..2b6691f 100644
--- a/frontends/amiga/ctxmenu.c
+++ b/frontends/amiga/ctxmenu.c
@@ -41,9 +41,9 @@
#include "utils/nsoption.h"
#include "utils/nsurl.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/browser_history.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c
index c646a5f..fb020ce 100644
--- a/frontends/amiga/download.c
+++ b/frontends/amiga/download.c
@@ -50,10 +50,10 @@
#include "utils/string.h"
#include "desktop/download.h"
#include "desktop/save_complete.h"
-#include "desktop/browser.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
-#include "desktop/gui_download.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
+#include "netsurf/download.h"
#include "content/handlers/image/ico.h"
#include "amiga/gui.h"
diff --git a/frontends/amiga/drag.c b/frontends/amiga/drag.c
index 67d1722..122ecd1 100644
--- a/frontends/amiga/drag.c
+++ b/frontends/amiga/drag.c
@@ -35,7 +35,7 @@
#include "utils/utils.h"
#include "utils/nsoption.h"
#include "content/hlcache.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "amiga/bitmap.h"
#include "amiga/clipboard.h"
diff --git a/frontends/amiga/drag.h b/frontends/amiga/drag.h
index 59a1a84..f8a1655 100644
--- a/frontends/amiga/drag.h
+++ b/frontends/amiga/drag.h
@@ -19,8 +19,8 @@
#ifndef AMIGA_DRAG_H
#define AMIGA_DRAG_H
#include <exec/types.h>
-#include "desktop/browser.h"
-#include "desktop/gui_window.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/window.h"
#define AMI_DRAG_THRESHOLD 10
diff --git a/frontends/amiga/dt_anim.c b/frontends/amiga/dt_anim.c
index fec7076..c177321 100644
--- a/frontends/amiga/dt_anim.c
+++ b/frontends/amiga/dt_anim.c
@@ -38,7 +38,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/bitmap.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/dt_picture.c b/frontends/amiga/dt_picture.c
index aba0893..49dde5e 100644
--- a/frontends/amiga/dt_picture.c
+++ b/frontends/amiga/dt_picture.c
@@ -34,7 +34,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/bitmap.h"
#include "content/handlers/image/image_cache.h"
diff --git a/frontends/amiga/dt_sound.c b/frontends/amiga/dt_sound.c
index fe1b1fc..04486c1 100644
--- a/frontends/amiga/dt_sound.c
+++ b/frontends/amiga/dt_sound.c
@@ -26,7 +26,7 @@
#include "amiga/filetype.h"
#include "amiga/datatypes.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "render/box.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/frontends/amiga/file.c b/frontends/amiga/file.c
index 8957ecf..595a981 100644
--- a/frontends/amiga/file.c
+++ b/frontends/amiga/file.c
@@ -29,11 +29,11 @@
#include "content/hlcache.h"
#include "content/content.h"
#include "content/fetch.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/save_complete.h"
#include "desktop/save_pdf.h"
#include "desktop/save_text.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/gui.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/font.c b/frontends/amiga/font.c
index 1c9702a..d3b9c32 100644
--- a/frontends/amiga/font.c
+++ b/frontends/amiga/font.c
@@ -24,8 +24,8 @@
#include "utils/log.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/layout.h"
#include "amiga/font.h"
#include "amiga/font_bullet.h"
diff --git a/frontends/amiga/font.h b/frontends/amiga/font.h
index cd52605..5e07211 100755
--- a/frontends/amiga/font.h
+++ b/frontends/amiga/font.h
@@ -19,7 +19,7 @@
#ifndef AMIGA_FONT_H
#define AMIGA_FONT_H
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/errors.h"
#include <graphics/rastport.h>
#include <graphics/text.h>
diff --git a/frontends/amiga/font_scan.c b/frontends/amiga/font_scan.c
index b65798d..c1c1732 100644
--- a/frontends/amiga/font_scan.c
+++ b/frontends/amiga/font_scan.c
@@ -48,8 +48,8 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
#include "amiga/font_scan.h"
#include "amiga/gui.h"
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index b3f4171..3ccb2eb 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -102,19 +102,19 @@
#include "content/urldb.h"
#include "content/handlers/image/ico.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/hotlist.h"
-#include "desktop/mouse.h"
-#include "desktop/netsurf.h"
+#include "netsurf/mouse.h"
+#include "netsurf/netsurf.h"
#include "desktop/version.h"
#include "desktop/save_complete.h"
#include "desktop/scrollbar.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
-#include "desktop/gui_window.h"
-#include "desktop/gui_fetch.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/window.h"
+#include "netsurf/fetch.h"
+#include "netsurf/misc.h"
/* NetSurf Amiga platform includes */
#include "amiga/gui.h"
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index d301ac5..c5c1c31 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -25,8 +25,8 @@
#include <dos/dos.h>
#include <devices/inputevent.h>
-#include "desktop/gui_window.h"
-#include "desktop/mouse.h"
+#include "netsurf/window.h"
+#include "netsurf/mouse.h"
#include "amiga/menu.h"
#include "amiga/object.h"
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index 9402a3f..d700eaf 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -61,9 +61,9 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/searchweb.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/file.h"
#include "amiga/font.h"
diff --git a/frontends/amiga/history.c b/frontends/amiga/history.c
index 72b69d4..bc16d30 100755
--- a/frontends/amiga/history.c
+++ b/frontends/amiga/history.c
@@ -20,8 +20,8 @@
#include <proto/exec.h>
#include "utils/errors.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
#include "amiga/history.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/history_local.c b/frontends/amiga/history_local.c
index 3016cbf..3a6cbe4 100755
--- a/frontends/amiga/history_local.c
+++ b/frontends/amiga/history_local.c
@@ -45,9 +45,9 @@
#include "utils/utils.h"
#include "utils/messages.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
-#include "desktop/plotters.h"
-#include "desktop/gui_window.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/plotters.h"
+#include "netsurf/window.h"
#include "graphics/rpattr.h"
#include "amiga/libs.h"
diff --git a/frontends/amiga/hotlist.c b/frontends/amiga/hotlist.c
index 79e679f..4469174 100755
--- a/frontends/amiga/hotlist.c
+++ b/frontends/amiga/hotlist.c
@@ -21,8 +21,8 @@
#include "utils/nsurl.h"
#include "desktop/hotlist.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
#include "amiga/hotlist.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c
index 819879d..201ce5f 100644
--- a/frontends/amiga/icon.c
+++ b/frontends/amiga/icon.c
@@ -41,7 +41,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "utils/file.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "netsurf/bitmap.h"
#include "content/content_protected.h"
diff --git a/frontends/amiga/login.c b/frontends/amiga/login.c
index a4c0d62..d54c2fa 100755
--- a/frontends/amiga/login.c
+++ b/frontends/amiga/login.c
@@ -41,8 +41,8 @@
#include "utils/messages.h"
#include "utils/errors.h"
#include "content/urldb.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
#include "amiga/gui.h"
#include "amiga/libs.h"
diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c
index 4a30c48..4fa5ba1 100644
--- a/frontends/amiga/menu.c
+++ b/frontends/amiga/menu.c
@@ -49,9 +49,9 @@
#include "utils/nsurl.h"
#include "content/hlcache.h"
#include "desktop/hotlist.h"
-#include "desktop/browser.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
#include "desktop/textinput.h"
#include "desktop/version.h"
diff --git a/frontends/amiga/misc.c b/frontends/amiga/misc.c
index 2c23358..1fc0373 100755
--- a/frontends/amiga/misc.c
+++ b/frontends/amiga/misc.c
@@ -36,7 +36,7 @@
#include "utils/nsurl.h"
#include "utils/url.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/gui.h"
#include "amiga/misc.h"
diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index fb9c923..fee3e7b 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -38,8 +38,8 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "netsurf/css.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
#include "amiga/plotters.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/plotters.h b/frontends/amiga/plotters.h
index 7baa21f..8fa2b06 100644
--- a/frontends/amiga/plotters.h
+++ b/frontends/amiga/plotters.h
@@ -18,7 +18,7 @@
#ifndef AMIGA_PLOTTERS_H
#define AMIGA_PLOTTERS_H
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include <proto/layers.h>
#include <proto/graphics.h>
diff --git a/frontends/amiga/plugin_hack.c b/frontends/amiga/plugin_hack.c
index 21f4da1..19fa66c 100644
--- a/frontends/amiga/plugin_hack.c
+++ b/frontends/amiga/plugin_hack.c
@@ -28,7 +28,7 @@
#include "amiga/plugin_hack.h"
#include "content/content_protected.h"
#include "content/hlcache.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c
index fcccc91..007245c 100644
--- a/frontends/amiga/print.c
+++ b/frontends/amiga/print.c
@@ -49,12 +49,12 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
#include "utils/utils.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/printer.h"
#include "desktop/print.h"
-#include "desktop/gui_layout.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/layout.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
#include "content/hlcache.h"
#include "amiga/plotters.h"
diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c
index 5ca9792..aaf54b0 100755
--- a/frontends/amiga/search.c
+++ b/frontends/amiga/search.c
@@ -48,11 +48,11 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/content.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/search.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
-#include "desktop/gui_search.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
+#include "netsurf/search.h"
#include "amiga/libs.h"
#include "amiga/misc.h"
diff --git a/frontends/amiga/selectmenu.c b/frontends/amiga/selectmenu.c
index 2593178..ffd4803 100644
--- a/frontends/amiga/selectmenu.c
+++ b/frontends/amiga/selectmenu.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "render/form.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "amiga/gui.h"
#include "amiga/selectmenu.h"
diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c
index 699ce71..ed72061 100644
--- a/frontends/amiga/sslcert.c
+++ b/frontends/amiga/sslcert.c
@@ -20,8 +20,8 @@
#include "utils/nsurl.h"
#include "content/llcache.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
#include "desktop/sslcert_viewer.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/theme.c b/frontends/amiga/theme.c
index ab32b23..f0fa31d 100644
--- a/frontends/amiga/theme.c
+++ b/frontends/amiga/theme.c
@@ -41,8 +41,8 @@
#include "utils/nsoption.h"
#include "utils/utils.h"
#include "desktop/searchweb.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
#include "amiga/gui.h"
#include "amiga/drag.h"
diff --git a/frontends/amiga/tree.c b/frontends/amiga/tree.c
index f147b5e..52d5899 100644
--- a/frontends/amiga/tree.c
+++ b/frontends/amiga/tree.c
@@ -55,11 +55,11 @@
#include "utils/messages.h"
#include "content/urldb.h"
#include "content/llcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/cookie_manager.h"
#include "desktop/global_history.h"
#include "desktop/hotlist.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/sslcert_viewer.h"
#include "amiga/gui.h"
diff --git a/frontends/amiga/utf8.c b/frontends/amiga/utf8.c
index 91d7c90..24af8c8 100755
--- a/frontends/amiga/utf8.c
+++ b/frontends/amiga/utf8.c
@@ -25,7 +25,7 @@
#include "utils/nsoption.h"
#include "utils/utf8.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/utf8.h"
#include "amiga/utf8.h"
diff --git a/frontends/atari/about.c b/frontends/atari/about.c
index 105037a..c541b0f 100644
--- a/frontends/atari/about.c
+++ b/frontends/atari/about.c
@@ -28,7 +28,7 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "desktop/version.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "curl/curlver.h"
diff --git a/frontends/atari/bitmap.c b/frontends/atari/bitmap.c
index 35886c0..d0de378 100644
--- a/frontends/atari/bitmap.c
+++ b/frontends/atari/bitmap.c
@@ -25,7 +25,7 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "netsurf/bitmap.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "atari/bitmap.h"
#include "atari/plot/plot.h"
diff --git a/frontends/atari/cookies.c b/frontends/atari/cookies.c
index 6019b47..78b8d60 100644
--- a/frontends/atari/cookies.c
+++ b/frontends/atari/cookies.c
@@ -20,8 +20,8 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/mouse.h"
-#include "desktop/plotters.h"
+#include "netsurf/mouse.h"
+#include "netsurf/plotters.h"
#include "desktop/cookie_manager.h"
#include "desktop/core_window.h"
diff --git a/frontends/atari/ctxmenu.c b/frontends/atari/ctxmenu.c
index 0343b20..e742035 100644
--- a/frontends/atari/ctxmenu.c
+++ b/frontends/atari/ctxmenu.c
@@ -19,7 +19,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/textinput.h"
#include "content/hlcache.h"
diff --git a/frontends/atari/deskmenu.c b/frontends/atari/deskmenu.c
index 7238358..2bb65cf 100644
--- a/frontends/atari/deskmenu.c
+++ b/frontends/atari/deskmenu.c
@@ -23,7 +23,7 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/save_complete.h"
#include "desktop/textinput.h"
diff --git a/frontends/atari/download.c b/frontends/atari/download.c
index 9ebe787..ebe3cc4 100644
--- a/frontends/atari/download.c
+++ b/frontends/atari/download.c
@@ -35,8 +35,8 @@
#include "desktop/save_complete.h"
#include "desktop/textinput.h"
#include "desktop/download.h"
-#include "desktop/browser.h"
-#include "desktop/gui_download.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/download.h"
#include "atari/gui.h"
#include "atari/misc.h"
diff --git a/frontends/atari/encoding.c b/frontends/atari/encoding.c
index 9a16cbd..5997cb0 100644
--- a/frontends/atari/encoding.c
+++ b/frontends/atari/encoding.c
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include "utils/errors.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/utf8.h"
#include "atari/encoding.h"
diff --git a/frontends/atari/font.c b/frontends/atari/font.c
index cb0c574..85fecce 100644
--- a/frontends/atari/font.c
+++ b/frontends/atari/font.c
@@ -24,9 +24,9 @@
#include "utils/utf8.h"
#include "utils/log.h"
#include "utils/nsoption.h"
-#include "desktop/gui_layout.h"
-#include "desktop/mouse.h"
-#include "desktop/plotters.h"
+#include "netsurf/layout.h"
+#include "netsurf/mouse.h"
+#include "netsurf/plotters.h"
#include "atari/gui.h"
#include "atari/plot/fontplot.h"
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 810c764..24caa7c 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -34,13 +34,13 @@
#include "content/backing_store.h"
#include "content/hlcache.h"
#include "desktop/treeview.h"
-#include "desktop/browser.h"
-#include "desktop/gui_layout.h"
-#include "desktop/gui_window.h"
-#include "desktop/gui_clipboard.h"
-#include "desktop/gui_fetch.h"
-#include "desktop/gui_misc.h"
-#include "desktop/netsurf.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/layout.h"
+#include "netsurf/window.h"
+#include "netsurf/clipboard.h"
+#include "netsurf/fetch.h"
+#include "netsurf/misc.h"
+#include "netsurf/netsurf.h"
#include "atari/gemtk/gemtk.h"
#include "atari/gui.h"
diff --git a/frontends/atari/gui.h b/frontends/atari/gui.h
index 50184d0..9c9aaaa 100644
--- a/frontends/atari/gui.h
+++ b/frontends/atari/gui.h
@@ -22,7 +22,7 @@
#include <stdbool.h>
#include <mt_gem.h>
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "atari/redrawslots.h"
#include "atari/gemtk/gemtk.h"
diff --git a/frontends/atari/history.c b/frontends/atari/history.c
index ba72c7f..d8b582e 100644
--- a/frontends/atari/history.c
+++ b/frontends/atari/history.c
@@ -21,7 +21,7 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/global_history.h"
#include "desktop/core_window.h"
diff --git a/frontends/atari/misc.c b/frontends/atari/misc.c
index 8688b93..c5a7052 100644
--- a/frontends/atari/misc.c
+++ b/frontends/atari/misc.c
@@ -29,7 +29,7 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/cookie_manager.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/tree.h"
#include "utils/nsoption.h"
#include "utils/messages.h"
diff --git a/frontends/atari/plot/font_freetype.c b/frontends/atari/plot/font_freetype.c
index a77aff8..6028207 100644
--- a/frontends/atari/plot/font_freetype.c
+++ b/frontends/atari/plot/font_freetype.c
@@ -24,7 +24,7 @@
#include "utils/log.h"
#include "utils/nsoption.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/plot_style.h"
#include "atari/gui.h"
diff --git a/frontends/atari/plot/font_internal.c b/frontends/atari/plot/font_internal.c
index 89a56d0..b96f4c7 100644
--- a/frontends/atari/plot/font_internal.c
+++ b/frontends/atari/plot/font_internal.c
@@ -24,7 +24,7 @@
#include "utils/utf8.h"
#include "utils/log.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/plot_style.h"
#include "atari/gui.h"
diff --git a/frontends/atari/plot/fontplot.c b/frontends/atari/plot/fontplot.c
index 9f0edd9..d0a1fe1 100644
--- a/frontends/atari/plot/fontplot.c
+++ b/frontends/atari/plot/fontplot.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <mt_gem.h>
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "desktop/plot_style.h"
#include "atari/bitmap.h"
diff --git a/frontends/atari/plot/plot.c b/frontends/atari/plot/plot.c
index f96039d..3a87802 100644
--- a/frontends/atari/plot/plot.c
+++ b/frontends/atari/plot/plot.c
@@ -30,8 +30,8 @@
#include "utils/utf8.h"
#include "utils/utils.h"
#include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
-#include "desktop/mouse.h"
+#include "netsurf/plotters.h"
+#include "netsurf/mouse.h"
#include "atari/gui.h"
#include "atari/osspec.h"
diff --git a/frontends/atari/rootwin.c b/frontends/atari/rootwin.c
index 605ce45..d309f8d 100644
--- a/frontends/atari/rootwin.c
+++ b/frontends/atari/rootwin.c
@@ -37,9 +37,9 @@
#include <mt_gem.h>
#include "utils/log.h"
-#include "desktop/browser.h"
-#include "desktop/mouse.h"
-#include "desktop/plotters.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/mouse.h"
+#include "netsurf/plotters.h"
#include "desktop/textinput.h"
#include "content/content.h"
#include "content/hlcache.h"
diff --git a/frontends/atari/search.c b/frontends/atari/search.c
index d72d3ca..4da7f16 100644
--- a/frontends/atari/search.c
+++ b/frontends/atari/search.c
@@ -27,9 +27,9 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/search.h"
-#include "desktop/gui_search.h"
+#include "netsurf/search.h"
#include "atari/gui.h"
#include "atari/rootwin.h"
diff --git a/frontends/atari/statusbar.c b/frontends/atari/statusbar.c
index c9d0f78..3a216f9 100644
--- a/frontends/atari/statusbar.c
+++ b/frontends/atari/statusbar.c
@@ -28,8 +28,8 @@
#include <math.h>
#include "utils/log.h"
-#include "desktop/mouse.h"
-#include "desktop/plotters.h"
+#include "netsurf/mouse.h"
+#include "netsurf/plotters.h"
#include "atari/gui.h"
#include "atari/statusbar.h"
diff --git a/frontends/atari/toolbar.c b/frontends/atari/toolbar.c
index f630332..27d7b53 100644
--- a/frontends/atari/toolbar.c
+++ b/frontends/atari/toolbar.c
@@ -32,10 +32,10 @@
#include "utils/nsurl.h"
#include "utils/utf8.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/mouse.h"
#include "desktop/plot_style.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/tree.h"
#include "desktop/hotlist.h"
#include "desktop/textarea.h"
diff --git a/frontends/atari/treeview.c b/frontends/atari/treeview.c
index 513e2df..1048fb0 100644
--- a/frontends/atari/treeview.c
+++ b/frontends/atari/treeview.c
@@ -28,8 +28,8 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/urldb.h"
-#include "desktop/plotters.h"
-#include "desktop/mouse.h"
+#include "netsurf/plotters.h"
+#include "netsurf/mouse.h"
#include "desktop/treeview.h"
#include "atari/gui.h"
diff --git a/frontends/beos/about.cpp b/frontends/beos/about.cpp
index 89eb818..70268ce 100644
--- a/frontends/beos/about.cpp
+++ b/frontends/beos/about.cpp
@@ -26,7 +26,7 @@ extern "C" {
#include "testament.h"
#include "utils/useragent.h"
#include "curl/curlver.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
}
#include "beos/about.h"
#include "beos/scaffolding.h"
diff --git a/frontends/beos/bitmap.cpp b/frontends/beos/bitmap.cpp
index c9c786a..4ce4075 100644
--- a/frontends/beos/bitmap.cpp
+++ b/frontends/beos/bitmap.cpp
@@ -40,8 +40,8 @@ extern "C" {
#include "utils/log.h"
#include "content/content.h"
#include "content/urldb.h"
-#include "desktop/plotters.h"
-#include "desktop/browser.h"
+#include "netsurf/plotters.h"
+#include "netsurf/browser_window.h"
#include "netsurf/bitmap.h"
}
diff --git a/frontends/beos/cookies.cpp b/frontends/beos/cookies.cpp
index d1357ff..d4c8e5b 100644
--- a/frontends/beos/cookies.cpp
+++ b/frontends/beos/cookies.cpp
@@ -21,10 +21,10 @@
#include <stdlib.h>
#include <string.h>
extern "C" {
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "utils/log.h"
#include "desktop/cookie_manager.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/tree.h"
#include "desktop/textinput.h"
#include "content/urldb.h"
diff --git a/frontends/beos/download.cpp b/frontends/beos/download.cpp
index ea0271e..b64591c 100644
--- a/frontends/beos/download.cpp
+++ b/frontends/beos/download.cpp
@@ -23,7 +23,7 @@
extern "C" {
#include "desktop/download.h"
-#include "desktop/gui_download.h"
+#include "netsurf/download.h"
#include "utils/utils.h"
#include "utils/string.h"
}
diff --git a/frontends/beos/font.cpp b/frontends/beos/font.cpp
index 003af52..407918f 100644
--- a/frontends/beos/font.cpp
+++ b/frontends/beos/font.cpp
@@ -36,7 +36,7 @@ extern "C" {
#include "utils/log.h"
#include "utils/nsoption.h"
#include "utils/nsurl.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
}
#include "beos/gui.h"
diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp
index 2e0aa4c..c52fa81 100644
--- a/frontends/beos/gui.cpp
+++ b/frontends/beos/gui.cpp
@@ -62,12 +62,12 @@ extern "C" {
#include "content/fetchers/resource.h"
#include "content/hlcache.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
-#include "desktop/gui_misc.h"
-#include "desktop/gui_clipboard.h"
-#include "desktop/gui_search.h"
-#include "desktop/gui_fetch.h"
-#include "desktop/netsurf.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/misc.h"
+#include "netsurf/clipboard.h"
+#include "netsurf/search.h"
+#include "netsurf/fetch.h"
+#include "netsurf/netsurf.h"
}
diff --git a/frontends/beos/login.cpp b/frontends/beos/login.cpp
index 7689c9d..ad09d86 100644
--- a/frontends/beos/login.cpp
+++ b/frontends/beos/login.cpp
@@ -30,11 +30,11 @@ extern "C" {
#include "utils/log.h"
#include "content/content.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "utils/messages.h"
#include "utils/url.h"
#include "utils/utils.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
}
#include "beos/gui.h"
#include "beos/scaffolding.h"
diff --git a/frontends/beos/plotters.cpp b/frontends/beos/plotters.cpp
index 3fd786e..5ba3fbb 100644
--- a/frontends/beos/plotters.cpp
+++ b/frontends/beos/plotters.cpp
@@ -31,7 +31,7 @@
#include <View.h>
#include <Shape.h>
extern "C" {
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/log.h"
#include "utils/utils.h"
#include "utils/nsoption.h"
diff --git a/frontends/beos/scaffolding.cpp b/frontends/beos/scaffolding.cpp
index 630e059..6cb9a77 100644
--- a/frontends/beos/scaffolding.cpp
+++ b/frontends/beos/scaffolding.cpp
@@ -54,12 +54,12 @@
extern "C" {
#include "content/content.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
-#include "desktop/netsurf.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/netsurf.h"
#include "desktop/version.h"
#include "desktop/searchweb.h"
#include "desktop/search.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/nsoption.h"
#include "desktop/textinput.h"
#include "render/form.h"
@@ -67,7 +67,7 @@ extern "C" {
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/nsurl.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/clipboard.h"
}
#include "beos/about.h"
#include "beos/bitmap.h"
diff --git a/frontends/beos/schedule.cpp b/frontends/beos/schedule.cpp
index a9da535..171d745 100644
--- a/frontends/beos/schedule.cpp
+++ b/frontends/beos/schedule.cpp
@@ -26,7 +26,7 @@ extern "C" {
#include "utils/errors.h"
#include "beos/schedule.h"
#include "content/content.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#ifdef DEBUG_BEOS_SCHEDULE
#include "utils/log.h"
diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp
index 62624f0..237d92a 100644
--- a/frontends/beos/window.cpp
+++ b/frontends/beos/window.cpp
@@ -29,12 +29,12 @@ extern "C" {
#include "utils/utils.h"
#include "content/content.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/mouse.h"
#include "desktop/textinput.h"
-#include "desktop/plotters.h"
-#include "desktop/gui_window.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/plotters.h"
+#include "netsurf/window.h"
+#include "netsurf/clipboard.h"
}
#include "beos/about.h"
diff --git a/frontends/cocoa/BookmarksController.m b/frontends/cocoa/BookmarksController.m
index 0bd51b2..e11cb3f 100644
--- a/frontends/cocoa/BookmarksController.m
+++ b/frontends/cocoa/BookmarksController.m
@@ -18,7 +18,7 @@
#import "utils/messages.h"
#import "utils/utils.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/hotlist.h"
#import "desktop/tree.h"
#import "content/hlcache.h"
diff --git a/frontends/cocoa/BrowserView.m b/frontends/cocoa/BrowserView.m
index fc50dbc..db1c249 100644
--- a/frontends/cocoa/BrowserView.m
+++ b/frontends/cocoa/BrowserView.m
@@ -18,8 +18,8 @@
#import "utils/nsoption.h"
#import "utils/messages.h"
-#import "desktop/browser.h"
-#import "desktop/plotters.h"
+#import "netsurf/browser_window.h"
+#import "netsurf/plotters.h"
#import "desktop/textinput.h"
#import "content/hlcache.h"
diff --git a/frontends/cocoa/BrowserViewController.m b/frontends/cocoa/BrowserViewController.m
index 5fa8b64..3540151 100644
--- a/frontends/cocoa/BrowserViewController.m
+++ b/frontends/cocoa/BrowserViewController.m
@@ -23,7 +23,7 @@
#import "utils/messages.h"
#import "utils/url.h"
#import "desktop/browser_history.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/textinput.h"
#import "content/hlcache.h"
diff --git a/frontends/cocoa/BrowserWindowController.m b/frontends/cocoa/BrowserWindowController.m
index bfb8be0..aa7375a 100644
--- a/frontends/cocoa/BrowserWindowController.m
+++ b/frontends/cocoa/BrowserWindowController.m
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "utils/nsoption.h"
#import "utils/messages.h"
#import "utils/utils.h"
diff --git a/frontends/cocoa/DownloadWindowController.m b/frontends/cocoa/DownloadWindowController.m
index 0c9d869..b8cf09b 100644
--- a/frontends/cocoa/DownloadWindowController.m
+++ b/frontends/cocoa/DownloadWindowController.m
@@ -19,7 +19,7 @@
#import "utils/log.h"
#import "utils/nsurl.h"
#import "desktop/download.h"
-#import "desktop/gui_download.h"
+#import "netsurf/download.h"
#import "cocoa/DownloadWindowController.h"
#import "cocoa/gui.h"
diff --git a/frontends/cocoa/FormSelectMenu.m b/frontends/cocoa/FormSelectMenu.m
index 84e04cd..b0ea0e6 100644
--- a/frontends/cocoa/FormSelectMenu.m
+++ b/frontends/cocoa/FormSelectMenu.m
@@ -19,7 +19,7 @@
#import "cocoa/FormSelectMenu.h"
#import "cocoa/coordinates.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "render/form.h"
static inline NSRect cocoa_rect_for_control( struct browser_window *bw, struct form_control *control)
diff --git a/frontends/cocoa/HistoryView.m b/frontends/cocoa/HistoryView.m
index 7b19233..bead8db 100644
--- a/frontends/cocoa/HistoryView.m
+++ b/frontends/cocoa/HistoryView.m
@@ -24,7 +24,7 @@
#import "cocoa/BrowserView.h"
#import "desktop/browser_history.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
@implementation HistoryView
diff --git a/frontends/cocoa/NetSurfAppDelegate.m b/frontends/cocoa/NetSurfAppDelegate.m
index f428563..0939a11 100644
--- a/frontends/cocoa/NetSurfAppDelegate.m
+++ b/frontends/cocoa/NetSurfAppDelegate.m
@@ -20,7 +20,7 @@
#import "utils/messages.h"
#import "utils/utils.h"
#import "utils/nsurl.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "cocoa/gui.h"
#import "cocoa/NetSurfAppDelegate.h"
diff --git a/frontends/cocoa/NetsurfApp.m b/frontends/cocoa/NetsurfApp.m
index 6fb8560..a8619e0 100644
--- a/frontends/cocoa/NetsurfApp.m
+++ b/frontends/cocoa/NetsurfApp.m
@@ -33,13 +33,13 @@
#import "utils/utils.h"
#import "content/urldb.h"
#import "utils/nsoption.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
#import "desktop/save_complete.h"
#import "desktop/textinput.h"
#import "desktop/tree.h"
#import "render/html.h"
-#import "desktop/mouse.h"
-#import "desktop/netsurf.h"
+#import "netsurf/mouse.h"
+#import "netsurf/netsurf.h"
#ifndef NETSURF_HOMEPAGE
#define NETSURF_HOMEPAGE "http://www.netsurf-browser.org/welcome/"
diff --git a/frontends/cocoa/PreferencesWindowController.m b/frontends/cocoa/PreferencesWindowController.m
index f314736..7522186 100644
--- a/frontends/cocoa/PreferencesWindowController.m
+++ b/frontends/cocoa/PreferencesWindowController.m
@@ -17,7 +17,7 @@
*/
#import "utils/nsoption.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "content/content.h"
#import "content/hlcache.h"
diff --git a/frontends/cocoa/SearchWindowController.m b/frontends/cocoa/SearchWindowController.m
index 1c896a9..95372fc 100644
--- a/frontends/cocoa/SearchWindowController.m
+++ b/frontends/cocoa/SearchWindowController.m
@@ -20,8 +20,8 @@
#import "cocoa/SearchWindowController.h"
#import "cocoa/BrowserViewController.h"
-#import "desktop/gui_search.h"
-#import "desktop/browser.h"
+#import "netsurf/search.h"
+#import "netsurf/browser_window.h"
#import "desktop/search.h"
static void cocoa_search_set_back( bool active, void *p );
diff --git a/frontends/cocoa/Tree.m b/frontends/cocoa/Tree.m
index 5cd796c..359d543 100644
--- a/frontends/cocoa/Tree.m
+++ b/frontends/cocoa/Tree.m
@@ -21,7 +21,7 @@
#import "cocoa/font.h"
#import "cocoa/plotter.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
#import "desktop/tree.h"
@implementation Tree
diff --git a/frontends/cocoa/TreeView.m b/frontends/cocoa/TreeView.m
index a58a496..71f5af4 100644
--- a/frontends/cocoa/TreeView.m
+++ b/frontends/cocoa/TreeView.m
@@ -19,7 +19,7 @@
#import "cocoa/TreeView.h"
#import "cocoa/Tree.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
#import "desktop/textinput.h"
@interface TreeView () <TreeDelegate>
diff --git a/frontends/cocoa/apple_image.m b/frontends/cocoa/apple_image.m
index 896cf4c..5c82a2b 100644
--- a/frontends/cocoa/apple_image.m
+++ b/frontends/cocoa/apple_image.m
@@ -23,7 +23,7 @@
#include "utils/config.h"
#include "content/content_protected.h"
#include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/utils.h"
#import "cocoa/schedule.h"
diff --git a/frontends/cocoa/bitmap.m b/frontends/cocoa/bitmap.m
index 14394d0..dd9e33f 100644
--- a/frontends/cocoa/bitmap.m
+++ b/frontends/cocoa/bitmap.m
@@ -23,8 +23,8 @@
#import <Cocoa/Cocoa.h>
-#import "desktop/browser.h"
-#import "desktop/plotters.h"
+#import "netsurf/browser_window.h"
+#import "netsurf/plotters.h"
#import "netsurf/bitmap.h"
#import "content/urldb.h"
#import "content/content.h"
diff --git a/frontends/cocoa/coordinates.h b/frontends/cocoa/coordinates.h
index a43db0b..4bd9222 100644
--- a/frontends/cocoa/coordinates.h
+++ b/frontends/cocoa/coordinates.h
@@ -20,7 +20,7 @@
#define COCOA_COORDINATES_H
#include "utils/utils.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
extern CGFloat cocoa_scale_factor;
diff --git a/frontends/cocoa/fetch.m b/frontends/cocoa/fetch.m
index 1c36bb8..0bbce09 100644
--- a/frontends/cocoa/fetch.m
+++ b/frontends/cocoa/fetch.m
@@ -20,7 +20,7 @@
#import "utils/log.h"
#import "utils/nsurl.h"
-#import "desktop/gui_fetch.h"
+#import "netsurf/fetch.h"
#import "cocoa/fetch.h"
diff --git a/frontends/cocoa/font.m b/frontends/cocoa/font.m
index f52ec85..483d989 100644
--- a/frontends/cocoa/font.m
+++ b/frontends/cocoa/font.m
@@ -22,8 +22,8 @@
#import "cocoa/font.h"
#import "utils/nsoption.h"
-#import "desktop/gui_layout.h"
-#import "desktop/plotters.h"
+#import "netsurf/layout.h"
+#import "netsurf/plotters.h"
static NSLayoutManager *cocoa_prepare_layout_manager( const char *string, size_t length,
diff --git a/frontends/cocoa/gui.m b/frontends/cocoa/gui.m
index c24357d..310e196 100644
--- a/frontends/cocoa/gui.m
+++ b/frontends/cocoa/gui.m
@@ -21,10 +21,10 @@
#import "utils/nsoption.h"
#import "utils/utils.h"
#import "utils/log.h"
-#import "desktop/mouse.h"
-#import "desktop/gui_window.h"
-#import "desktop/gui_misc.h"
-#import "desktop/browser.h"
+#import "netsurf/mouse.h"
+#import "netsurf/window.h"
+#import "netsurf/misc.h"
+#import "netsurf/browser_window.h"
#import "desktop/textinput.h"
#import "content/handlers/image/ico.h"
#import "content/fetchers/resource.h"
diff --git a/frontends/cocoa/plotter.m b/frontends/cocoa/plotter.m
index dbc9460..2b721bf 100644
--- a/frontends/cocoa/plotter.m
+++ b/frontends/cocoa/plotter.m
@@ -20,8 +20,8 @@
#import "utils/log.h"
#import "utils/utils.h"
-#import "desktop/browser.h"
-#import "desktop/plotters.h"
+#import "netsurf/browser_window.h"
+#import "netsurf/plotters.h"
#import "desktop/plot_style.h"
#import "cocoa/font.h"
diff --git a/frontends/cocoa/selection.m b/frontends/cocoa/selection.m
index 808b706..37562bc 100644
--- a/frontends/cocoa/selection.m
+++ b/frontends/cocoa/selection.m
@@ -21,7 +21,7 @@
#import "cocoa/BrowserViewController.h"
#import "cocoa/selection.h"
-#import "desktop/gui_clipboard.h"
+#import "netsurf/clipboard.h"
static NSMutableString *cocoa_clipboard_string;
diff --git a/frontends/framebuffer/bitmap.c b/frontends/framebuffer/bitmap.c
index df99e71..dbe5647 100644
--- a/frontends/framebuffer/bitmap.c
+++ b/frontends/framebuffer/bitmap.c
@@ -31,7 +31,7 @@
#include "utils/log.h"
#include "utils/utils.h"
#include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "content/content.h"
#include "framebuffer/gui.h"
diff --git a/frontends/framebuffer/clipboard.c b/frontends/framebuffer/clipboard.c
index 05defe8..1254c36 100644
--- a/frontends/framebuffer/clipboard.c
+++ b/frontends/framebuffer/clipboard.c
@@ -26,8 +26,8 @@
#include <stdlib.h>
#include "utils/log.h"
-#include "desktop/browser.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/clipboard.h"
#include "framebuffer/gui.h"
#include "framebuffer/clipboard.h"
diff --git a/frontends/framebuffer/fbtk/bitmap.c b/frontends/framebuffer/fbtk/bitmap.c
index 1f147be..759b626 100644
--- a/frontends/framebuffer/fbtk/bitmap.c
+++ b/frontends/framebuffer/fbtk/bitmap.c
@@ -24,7 +24,7 @@
#include <libnsfb.h>
#include <libnsfb_plot.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fbtk/event.c b/frontends/framebuffer/fbtk/event.c
index c089492..dab0355 100644
--- a/frontends/framebuffer/fbtk/event.c
+++ b/frontends/framebuffer/fbtk/event.c
@@ -31,7 +31,7 @@
#include "utils/utils.h"
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/textinput.h"
#include "framebuffer/gui.h"
diff --git a/frontends/framebuffer/fbtk/fbtk.c b/frontends/framebuffer/fbtk/fbtk.c
index db1c1f1..c63a6d8 100644
--- a/frontends/framebuffer/fbtk/fbtk.c
+++ b/frontends/framebuffer/fbtk/fbtk.c
@@ -34,8 +34,8 @@
#include "utils/utils.h"
#include "utils/log.h"
-#include "desktop/browser.h"
-#include "desktop/plotters.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/plotters.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fbtk/fill.c b/frontends/framebuffer/fbtk/fill.c
index 07397b2..9377933 100644
--- a/frontends/framebuffer/fbtk/fill.c
+++ b/frontends/framebuffer/fbtk/fill.c
@@ -24,7 +24,7 @@
#include <libnsfb.h>
#include <libnsfb_plot.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fbtk/osk.c b/frontends/framebuffer/fbtk/osk.c
index 1d57f15..628fe9a 100644
--- a/frontends/framebuffer/fbtk/osk.c
+++ b/frontends/framebuffer/fbtk/osk.c
@@ -27,7 +27,7 @@
#include <libnsfb_cursor.h>
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fbtk/scroll.c b/frontends/framebuffer/fbtk/scroll.c
index c86c8a6..cc98fb2 100644
--- a/frontends/framebuffer/fbtk/scroll.c
+++ b/frontends/framebuffer/fbtk/scroll.c
@@ -28,7 +28,7 @@
#include <libnsfb_cursor.h>
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fbtk/text.c b/frontends/framebuffer/fbtk/text.c
index 258e9df..00dcba4 100644
--- a/frontends/framebuffer/fbtk/text.c
+++ b/frontends/framebuffer/fbtk/text.c
@@ -28,8 +28,8 @@
#include <libnsfb_event.h>
#include "utils/log.h"
-#include "desktop/browser.h"
-#include "desktop/plotters.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/plotters.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fbtk/window.c b/frontends/framebuffer/fbtk/window.c
index 787dac7..b385e8e 100644
--- a/frontends/framebuffer/fbtk/window.c
+++ b/frontends/framebuffer/fbtk/window.c
@@ -24,7 +24,7 @@
#include <libnsfb.h>
#include <libnsfb_plot.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fetch.c b/frontends/framebuffer/fetch.c
index 24920fb..e6b72e0 100644
--- a/frontends/framebuffer/fetch.c
+++ b/frontends/framebuffer/fetch.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "utils/filepath.h"
#include "utils/file.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "framebuffer/findfile.h"
#include "framebuffer/fetch.h"
diff --git a/frontends/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c
index 7756ae7..9235ad4 100644
--- a/frontends/framebuffer/font_freetype.c
+++ b/frontends/framebuffer/font_freetype.c
@@ -27,9 +27,9 @@
#include "utils/utf8.h"
#include "utils/log.h"
#include "utils/nsoption.h"
-#include "desktop/gui_utf8.h"
-#include "desktop/gui_layout.h"
-#include "desktop/browser.h"
+#include "netsurf/utf8.h"
+#include "netsurf/layout.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/font.h"
diff --git a/frontends/framebuffer/font_internal.c b/frontends/framebuffer/font_internal.c
index 7578e64..9164a29 100644
--- a/frontends/framebuffer/font_internal.c
+++ b/frontends/framebuffer/font_internal.c
@@ -24,8 +24,8 @@
#include "utils/nsoption.h"
#include "utils/utf8.h"
-#include "desktop/gui_utf8.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/utf8.h"
+#include "netsurf/layout.h"
#include "framebuffer/gui.h"
#include "framebuffer/font.h"
diff --git a/frontends/framebuffer/framebuffer.c b/frontends/framebuffer/framebuffer.c
index 16e9dd7..74c72fe 100644
--- a/frontends/framebuffer/framebuffer.c
+++ b/frontends/framebuffer/framebuffer.c
@@ -31,8 +31,8 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/utf8.h"
-#include "desktop/browser.h"
-#include "desktop/plotters.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/plotters.h"
#include "netsurf/bitmap.h"
#include "framebuffer/gui.h"
diff --git a/frontends/framebuffer/gui.c b/frontends/framebuffer/gui.c
index b0b98c5..7ef64b0 100644
--- a/frontends/framebuffer/gui.c
+++ b/frontends/framebuffer/gui.c
@@ -34,13 +34,13 @@
#include "utils/filepath.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/textinput.h"
#include "desktop/browser_history.h"
-#include "desktop/plotters.h"
-#include "desktop/gui_window.h"
-#include "desktop/gui_misc.h"
-#include "desktop/netsurf.h"
+#include "netsurf/plotters.h"
+#include "netsurf/window.h"
+#include "netsurf/misc.h"
+#include "netsurf/netsurf.h"
#include "content/urldb.h"
#include "content/fetch.h"
diff --git a/frontends/framebuffer/localhistory.c b/frontends/framebuffer/localhistory.c
index 1b2eb9a..3192f07 100644
--- a/frontends/framebuffer/localhistory.c
+++ b/frontends/framebuffer/localhistory.c
@@ -25,7 +25,7 @@
#include <libnsfb_event.h>
#include "desktop/browser_history.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/gtk/about.c b/frontends/gtk/about.c
index d57afea..f003faf 100644
--- a/frontends/gtk/about.c
+++ b/frontends/gtk/about.c
@@ -28,7 +28,7 @@
#include "utils/messages.h"
#include "utils/nsoption.h"
#include "utils/nsurl.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/version.h"
#include "gtk/warn.h"
diff --git a/frontends/gtk/bitmap.c b/frontends/gtk/bitmap.c
index ff5a0c4..1def140 100644
--- a/frontends/gtk/bitmap.c
+++ b/frontends/gtk/bitmap.c
@@ -34,7 +34,7 @@
#include "utils/log.h"
#include "content/content.h"
#include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "gtk/scaffolding.h"
#include "gtk/plotters.h"
diff --git a/frontends/gtk/completion.c b/frontends/gtk/completion.c
index 8444c83..9b76411 100644
--- a/frontends/gtk/completion.c
+++ b/frontends/gtk/completion.c
@@ -28,7 +28,7 @@
#include "utils/nsoption.h"
#include "content/urldb.h"
#include "desktop/searchweb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "gtk/warn.h"
#include "gtk/scaffolding.h"
diff --git a/frontends/gtk/download.c b/frontends/gtk/download.c
index b7eea25..8c81614 100644
--- a/frontends/gtk/download.c
+++ b/frontends/gtk/download.c
@@ -30,7 +30,7 @@
#include "utils/nsoption.h"
#include "utils/string.h"
#include "desktop/download.h"
-#include "desktop/gui_download.h"
+#include "netsurf/download.h"
#include "gtk/warn.h"
#include "gtk/scaffolding.h"
diff --git a/frontends/gtk/fetch.c b/frontends/gtk/fetch.c
index 06770b6..1f397e1 100644
--- a/frontends/gtk/fetch.c
+++ b/frontends/gtk/fetch.c
@@ -32,7 +32,7 @@
#include "utils/filepath.h"
#include "utils/file.h"
#include "utils/nsurl.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "gtk/gui.h"
#include "gtk/resources.h"
diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index 6430f9d..27b73b1 100644
--- a/frontends/gtk/gui.c
+++ b/frontends/gtk/gui.c
@@ -42,14 +42,14 @@
#include "content/hlcache.h"
#include "content/urldb.h"
#include "content/backing_store.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/save_complete.h"
#include "desktop/save_pdf.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
-#include "desktop/gui_misc.h"
-#include "desktop/netsurf.h"
+#include "netsurf/misc.h"
+#include "netsurf/netsurf.h"
#include "gtk/compat.h"
#include "gtk/warn.h"
diff --git a/frontends/gtk/layout_pango.c b/frontends/gtk/layout_pango.c
index 49b6293..a0196df 100644
--- a/frontends/gtk/layout_pango.c
+++ b/frontends/gtk/layout_pango.c
@@ -30,7 +30,7 @@
#include "utils/log.h"
#include "utils/nsoption.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "gtk/layout_pango.h"
#include "gtk/plotters.h"
diff --git a/frontends/gtk/plotters.c b/frontends/gtk/plotters.c
index 1d8c198..1cebf58 100644
--- a/frontends/gtk/plotters.c
+++ b/frontends/gtk/plotters.c
@@ -32,7 +32,7 @@
#include "utils/log.h"
#include "utils/utils.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/nsoption.h"
#include "gtk/layout_pango.h"
diff --git a/frontends/gtk/preferences.c b/frontends/gtk/preferences.c
index 3efb9ed..e51e770 100644
--- a/frontends/gtk/preferences.c
+++ b/frontends/gtk/preferences.c
@@ -26,7 +26,7 @@
#include "utils/file.h"
#include "utils/log.h"
#include "utils/nsurl.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/searchweb.h"
#include "gtk/compat.h"
diff --git a/frontends/gtk/print.c b/frontends/gtk/print.c
index a6e6399..17cb96f 100644
--- a/frontends/gtk/print.c
+++ b/frontends/gtk/print.c
@@ -36,7 +36,7 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "utils/nsoption.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/print.h"
#include "desktop/printer.h"
diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
index 7772567..38dfd21 100644
--- a/frontends/gtk/scaffolding.c
+++ b/frontends/gtk/scaffolding.c
@@ -34,9 +34,9 @@
#include "utils/nsoption.h"
#include "utils/file.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/hotlist.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/print.h"
#include "desktop/save_complete.h"
#ifdef WITH_PDF_EXPORT
diff --git a/frontends/gtk/search.c b/frontends/gtk/search.c
index d2adcf1..2c73814 100644
--- a/frontends/gtk/search.c
+++ b/frontends/gtk/search.c
@@ -30,10 +30,10 @@
#include "utils/messages.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/search.h"
#include "desktop/searchweb.h"
-#include "desktop/gui_search.h"
+#include "netsurf/search.h"
#include "gtk/warn.h"
#include "gtk/compat.h"
diff --git a/frontends/gtk/selection.c b/frontends/gtk/selection.c
index d1388ed..228d65d 100644
--- a/frontends/gtk/selection.c
+++ b/frontends/gtk/selection.c
@@ -21,8 +21,8 @@
#include <stdlib.h>
#include "utils/log.h"
-#include "desktop/browser.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/clipboard.h"
#include "gtk/window.h"
diff --git a/frontends/gtk/tabs.c b/frontends/gtk/tabs.c
index e8be7ee..56a1ed6 100644
--- a/frontends/gtk/tabs.c
+++ b/frontends/gtk/tabs.c
@@ -21,7 +21,7 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "content/content.h"
#include "desktop/search.h"
diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c
index b7bf07f..6866f00 100644
--- a/frontends/gtk/toolbar.c
+++ b/frontends/gtk/toolbar.c
@@ -21,7 +21,7 @@
#include <unistd.h>
#include <gtk/gtk.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/searchweb.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/frontends/gtk/treeview.c b/frontends/gtk/treeview.c
index 9baf57b..829e87a 100644
--- a/frontends/gtk/treeview.c
+++ b/frontends/gtk/treeview.c
@@ -33,7 +33,7 @@
#include "utils/log.h"
#include "utils/utf8.h"
#include "desktop/tree.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "gtk/warn.h"
#include "gtk/compat.h"
diff --git a/frontends/gtk/viewdata.c b/frontends/gtk/viewdata.c
index 55b2546..90a2366 100644
--- a/frontends/gtk/viewdata.c
+++ b/frontends/gtk/viewdata.c
@@ -41,7 +41,7 @@
#include "utils/file.h"
#include "utils/filepath.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "content/hlcache.h"
#include "content/content.h"
diff --git a/frontends/gtk/viewsource.c b/frontends/gtk/viewsource.c
index 554cfbf..b0907a3 100644
--- a/frontends/gtk/viewsource.c
+++ b/frontends/gtk/viewsource.c
@@ -23,7 +23,7 @@
#include "utils/utf8.h"
#include "utils/nsurl.h"
#include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "content/content.h"
#include "gtk/viewdata.h"
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index de333d1..dd713cb 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -39,12 +39,12 @@
#include "content/hlcache.h"
#include "gtk/window.h"
#include "gtk/selection.h"
-#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/mouse.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
-#include "desktop/gui_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/window.h"
+#include "netsurf/plotters.h"
#include "render/form.h"
#include "gtk/warn.h"
diff --git a/frontends/monkey/browser.c b/frontends/monkey/browser.c
index dfd2dcf..bfabd0f 100644
--- a/frontends/monkey/browser.c
+++ b/frontends/monkey/browser.c
@@ -25,10 +25,10 @@
#include "utils/ring.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
-#include "desktop/browser.h"
-#include "desktop/plotters.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/plotters.h"
#include "content/hlcache.h"
#include "monkey/browser.h"
diff --git a/frontends/monkey/download.c b/frontends/monkey/download.c
index 2421366..3224105 100644
--- a/frontends/monkey/download.c
+++ b/frontends/monkey/download.c
@@ -22,7 +22,7 @@
#include "utils/errors.h"
#include "utils/ring.h"
-#include "desktop/gui_download.h"
+#include "netsurf/download.h"
#include "desktop/download.h"
#include "content/hlcache.h"
diff --git a/frontends/monkey/fetch.c b/frontends/monkey/fetch.c
index 86732cf..4985329 100644
--- a/frontends/monkey/fetch.c
+++ b/frontends/monkey/fetch.c
@@ -26,7 +26,7 @@
#include "utils/file.h"
#include "utils/nsurl.h"
#include "utils/filepath.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "monkey/filetype.h"
#include "monkey/fetch.h"
diff --git a/frontends/monkey/layout.c b/frontends/monkey/layout.c
index 401ca15..00ed9df 100644
--- a/frontends/monkey/layout.c
+++ b/frontends/monkey/layout.c
@@ -25,7 +25,7 @@
#include "utils/utf8.h"
#include "desktop/plot_style.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "monkey/layout.h"
diff --git a/frontends/monkey/main.c b/frontends/monkey/main.c
index ff70bda..756eadb 100644
--- a/frontends/monkey/main.c
+++ b/frontends/monkey/main.c
@@ -33,8 +33,8 @@
#include "content/fetchers.h"
#include "content/fetchers/resource.h"
#include "content/hlcache.h"
-#include "desktop/gui_misc.h"
-#include "desktop/netsurf.h"
+#include "netsurf/misc.h"
+#include "netsurf/netsurf.h"
#include "monkey/dispatch.h"
#include "monkey/browser.h"
diff --git a/frontends/monkey/plot.c b/frontends/monkey/plot.c
index 50f8124..bd94e75 100644
--- a/frontends/monkey/plot.c
+++ b/frontends/monkey/plot.c
@@ -19,7 +19,7 @@
#include <stdio.h>
#include "utils/utils.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
static bool
monkey_plot_disc(int x, int y, int radius, const plot_style_t *style)
diff --git a/frontends/riscos/401login.c b/frontends/riscos/401login.c
index e95a748..476d631 100644
--- a/frontends/riscos/401login.c
+++ b/frontends/riscos/401login.c
@@ -28,7 +28,6 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
#include "riscos/gui.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/bitmap.c b/frontends/riscos/bitmap.c
index 525a230..e0fd38b 100644
--- a/frontends/riscos/bitmap.c
+++ b/frontends/riscos/bitmap.c
@@ -43,7 +43,7 @@
#include "utils/filename.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "content/content.h"
#include "netsurf/bitmap.h"
diff --git a/frontends/riscos/content-handlers/artworks.c b/frontends/riscos/content-handlers/artworks.c
index b6f7a0d..517a6ff 100644
--- a/frontends/riscos/content-handlers/artworks.c
+++ b/frontends/riscos/content-handlers/artworks.c
@@ -37,7 +37,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "riscos/content-handlers/artworks.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/content-handlers/draw.c b/frontends/riscos/content-handlers/draw.c
index f2bee16..0b1b072 100644
--- a/frontends/riscos/content-handlers/draw.c
+++ b/frontends/riscos/content-handlers/draw.c
@@ -34,7 +34,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "riscos/content-handlers/draw.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/content-handlers/sprite.c b/frontends/riscos/content-handlers/sprite.c
index 12fed49..3ef48c8 100644
--- a/frontends/riscos/content-handlers/sprite.c
+++ b/frontends/riscos/content-handlers/sprite.c
@@ -33,7 +33,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "riscos/gui.h"
#include "riscos/image.h"
diff --git a/frontends/riscos/dialog.c b/frontends/riscos/dialog.c
index d435608..2b258bb 100644
--- a/frontends/riscos/dialog.c
+++ b/frontends/riscos/dialog.c
@@ -39,7 +39,7 @@
#include "utils/messages.h"
#include "utils/nsurl.h"
#include "desktop/version.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/configure.h"
#include "riscos/cookies.h"
diff --git a/frontends/riscos/download.c b/frontends/riscos/download.c
index cddb449..7dd61b7 100644
--- a/frontends/riscos/download.c
+++ b/frontends/riscos/download.c
@@ -22,7 +22,7 @@
* \file
* RISC OS download windows implementation.
*
- * This file implements the interface given by desktop/gui_download.h
+ * This file implements the interface given by netsurf/download.h
* for download windows. Each download window has an associated
* fetch. Downloads start by writing received data to a temporary
* file. At some point the user chooses a destination (by drag &
@@ -54,7 +54,7 @@
#include "utils/utils.h"
#include "utils/string.h"
#include "utils/corestrings.h"
-#include "desktop/gui_download.h"
+#include "netsurf/download.h"
#include "desktop/download.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/font.c b/frontends/riscos/font.c
index 2f2ba9a..a7a394e 100644
--- a/frontends/riscos/font.c
+++ b/frontends/riscos/font.c
@@ -34,7 +34,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "riscos/gui.h"
#include "riscos/font.h"
diff --git a/frontends/riscos/global_history.c b/frontends/riscos/global_history.c
index c469847..88c071c 100644
--- a/frontends/riscos/global_history.c
+++ b/frontends/riscos/global_history.c
@@ -36,7 +36,7 @@
#include "utils/log.h"
#include "desktop/global_history.h"
#include "desktop/tree.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "riscos/dialog.h"
#include "riscos/global_history.h"
diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c
index 309f27b..e0e8e4e 100644
--- a/frontends/riscos/gui.c
+++ b/frontends/riscos/gui.c
@@ -47,12 +47,12 @@
#include "utils/filename.h"
#include "utils/url.h"
#include "utils/corestrings.h"
-#include "desktop/gui_fetch.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/fetch.h"
+#include "netsurf/misc.h"
#include "desktop/save_complete.h"
#include "desktop/treeview.h"
-#include "desktop/netsurf.h"
-#include "desktop/browser.h"
+#include "netsurf/netsurf.h"
+#include "netsurf/browser_window.h"
#include "content/urldb.h"
#include "content/hlcache.h"
#include "content/backing_store.h"
diff --git a/frontends/riscos/gui/progress_bar.c b/frontends/riscos/gui/progress_bar.c
index 3ec6b3a..c26b46c 100644
--- a/frontends/riscos/gui/progress_bar.c
+++ b/frontends/riscos/gui/progress_bar.c
@@ -30,7 +30,7 @@
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/log.h"
#include "utils/utils.h"
diff --git a/frontends/riscos/gui/status_bar.c b/frontends/riscos/gui/status_bar.c
index cbc4046..9d1bada 100644
--- a/frontends/riscos/gui/status_bar.c
+++ b/frontends/riscos/gui/status_bar.c
@@ -28,7 +28,7 @@
#include "oslib/os.h"
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/log.h"
#include "utils/utils.h"
diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c
index 0530147..80a7b4a 100644
--- a/frontends/riscos/gui/url_bar.c
+++ b/frontends/riscos/gui/url_bar.c
@@ -37,8 +37,8 @@
#include "utils/utils.h"
#include "content/hlcache.h"
#include "content/content.h"
-#include "desktop/browser.h"
-#include "desktop/plotters.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/plotters.h"
#include "riscos/gui.h"
#include "riscos/hotlist.h"
diff --git a/frontends/riscos/help.c b/frontends/riscos/help.c
index 73cb695..64d4a2f 100644
--- a/frontends/riscos/help.c
+++ b/frontends/riscos/help.c
@@ -27,8 +27,8 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utf8.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
#include "riscos/treeview.h"
#include "riscos/help.h"
diff --git a/frontends/riscos/history.c b/frontends/riscos/history.c
index 9d78f6d..de3af08 100644
--- a/frontends/riscos/history.c
+++ b/frontends/riscos/history.c
@@ -31,7 +31,7 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "desktop/browser_history.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "riscos/dialog.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/hotlist.c b/frontends/riscos/hotlist.c
index 381978f..d4acbc6 100644
--- a/frontends/riscos/hotlist.c
+++ b/frontends/riscos/hotlist.c
@@ -39,7 +39,7 @@
#include "content/urldb.h"
#include "desktop/hotlist.h"
#include "desktop/tree.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "riscos/gui.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/iconbar.c b/frontends/riscos/iconbar.c
index 9cff116..8582a45 100644
--- a/frontends/riscos/iconbar.c
+++ b/frontends/riscos/iconbar.c
@@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Iconbar icon and menus (implementation).
+/**
+ * \file
+ * Iconbar icon and menus implementation.
*/
#include <assert.h>
@@ -36,7 +37,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/nsurl.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/gui.h"
#include "riscos/configure.h"
diff --git a/frontends/riscos/menus.c b/frontends/riscos/menus.c
index 37285c9..0b1ac1a 100644
--- a/frontends/riscos/menus.c
+++ b/frontends/riscos/menus.c
@@ -40,7 +40,6 @@
#include "content/hlcache.h"
#include "content/urldb.h"
#include "desktop/cookie_manager.h"
-#include "desktop/browser.h"
#include "desktop/textinput.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/plotters.c b/frontends/riscos/plotters.c
index 38fd9d7..9c98138 100644
--- a/frontends/riscos/plotters.c
+++ b/frontends/riscos/plotters.c
@@ -28,7 +28,7 @@
#include "utils/log.h"
#include "utils/utils.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "riscos/bitmap.h"
#include "riscos/image.h"
diff --git a/frontends/riscos/print.c b/frontends/riscos/print.c
index 95730d6..da16664 100644
--- a/frontends/riscos/print.c
+++ b/frontends/riscos/print.c
@@ -38,8 +38,8 @@
#include "utils/nsoption.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
-#include "desktop/plotters.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/plotters.h"
#include "riscos/gui.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/save.c b/frontends/riscos/save.c
index 0432b1a..325dbbb 100644
--- a/frontends/riscos/save.c
+++ b/frontends/riscos/save.c
@@ -42,13 +42,13 @@
#include "utils/utf8.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/hotlist.h"
#include "desktop/global_history.h"
#include "desktop/version.h"
#include "desktop/save_complete.h"
#include "desktop/save_text.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "netsurf/bitmap.h"
#include "render/form.h"
diff --git a/frontends/riscos/save_draw.c b/frontends/riscos/save_draw.c
index 50febf3..7ba2c94 100644
--- a/frontends/riscos/save_draw.c
+++ b/frontends/riscos/save_draw.c
@@ -34,7 +34,7 @@
#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "riscos/bitmap.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/search.c b/frontends/riscos/search.c
index 989c9aa..544630e 100644
--- a/frontends/riscos/search.c
+++ b/frontends/riscos/search.c
@@ -33,9 +33,8 @@
#include "utils/messages.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
-#include "desktop/gui_search.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/search.h"
#include "desktop/search.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/sslcert.c b/frontends/riscos/sslcert.c
index 9e43f2d..7ab909d 100644
--- a/frontends/riscos/sslcert.c
+++ b/frontends/riscos/sslcert.c
@@ -34,7 +34,6 @@
#include "content/hlcache.h"
#include "content/fetch.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
#include "desktop/sslcert_viewer.h"
#include "desktop/tree.h"
diff --git a/frontends/riscos/textarea.c b/frontends/riscos/textarea.c
index ecf3e0c..d987292 100644
--- a/frontends/riscos/textarea.c
+++ b/frontends/riscos/textarea.c
@@ -33,7 +33,6 @@
#include "utils/log.h"
#include "utils/utf8.h"
-#include "desktop/browser.h"
#include "riscos/gui.h"
#include "riscos/oslib_pre7.h"
diff --git a/frontends/riscos/textselection.c b/frontends/riscos/textselection.c
index 718171d..8127448 100644
--- a/frontends/riscos/textselection.c
+++ b/frontends/riscos/textselection.c
@@ -16,9 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Text selection code (platform-dependent implementation)
- */
+/**
+ * \file
+ * RISC OS text selection implementation.
+ */
#include <assert.h>
#include <stdio.h>
@@ -31,10 +32,10 @@
#include "utils/utf8.h"
#include "utils/utils.h"
#include "content/hlcache.h"
-#include "desktop/gui_clipboard.h"
-#include "desktop/gui_window.h"
+#include "netsurf/clipboard.h"
+#include "netsurf/window.h"
#include "desktop/textinput.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/gui.h"
#include "riscos/menus.h"
diff --git a/frontends/riscos/theme_install.c b/frontends/riscos/theme_install.c
index 5c11ffb..3448e74 100644
--- a/frontends/riscos/theme_install.c
+++ b/frontends/riscos/theme_install.c
@@ -30,7 +30,6 @@
#include "utils/messages.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
#include "desktop/theme.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/toolbar.c b/frontends/riscos/toolbar.c
index 83751a7..2f758f5 100644
--- a/frontends/riscos/toolbar.c
+++ b/frontends/riscos/toolbar.c
@@ -41,7 +41,6 @@
#include "utils/log.h"
#include "utils/nsoption.h"
#include "content/content.h"
-#include "desktop/plotters.h"
#include "riscos/cookies.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/treeview.c b/frontends/riscos/treeview.c
index 3428ad3..1cae801 100644
--- a/frontends/riscos/treeview.c
+++ b/frontends/riscos/treeview.c
@@ -40,8 +40,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
diff --git a/frontends/riscos/ucstables.c b/frontends/riscos/ucstables.c
index 7ac685d..8e538ef 100644
--- a/frontends/riscos/ucstables.c
+++ b/frontends/riscos/ucstables.c
@@ -32,7 +32,7 @@
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/utils.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/utf8.h"
#include "riscos/ucstables.h"
diff --git a/frontends/riscos/uri.c b/frontends/riscos/uri.c
index 9c384c9..a2f126b 100644
--- a/frontends/riscos/uri.c
+++ b/frontends/riscos/uri.c
@@ -16,6 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/**
+ * \file
+ * RISC OS URI message handling implementation.
+ */
+
#include "utils/config.h"
#include <stdbool.h>
@@ -29,7 +34,7 @@
#include "utils/messages.h"
#include "utils/nsurl.h"
#include "content/fetch.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/gui.h"
#include "riscos/uri.h"
diff --git a/frontends/riscos/url_complete.c b/frontends/riscos/url_complete.c
index 3cf7f92..eebb764 100644
--- a/frontends/riscos/url_complete.c
+++ b/frontends/riscos/url_complete.c
@@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * GUI URL auto-completion (implementation).
+/**
+ * \file
+ * GUI URL auto-completion implementation.
*/
#include <assert.h>
@@ -30,7 +31,7 @@
#include "utils/log.h"
#include "utils/nsoption.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/global_history.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/url_protocol.c b/frontends/riscos/url_protocol.c
index 2b9ef35..9a7ae06 100644
--- a/frontends/riscos/url_protocol.c
+++ b/frontends/riscos/url_protocol.c
@@ -18,8 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * ANT URL launching protocol (implementation).
+/**
+ * \file
+ * ANT URL launching protocol implementation.
*
* See http://www.vigay.com/inet/inet_url.html
*/
@@ -38,7 +39,7 @@
#include "utils/nsurl.h"
#include "utils/config.h"
#include "content/fetch.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/gui.h"
#include "riscos/uri.h"
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index b6d074f..e99ed31 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -56,15 +56,15 @@
#include "content/hlcache.h"
#include "content/urldb.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/cookie_manager.h"
#include "desktop/scrollbar.h"
#include "desktop/frames.h"
-#include "desktop/mouse.h"
-#include "desktop/plotters.h"
+#include "netsurf/mouse.h"
+#include "netsurf/plotters.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "netsurf/bitmap.h"
#include "render/form.h"
diff --git a/frontends/windows/bitmap.c b/frontends/windows/bitmap.c
index a50d9aa..936b28e 100644
--- a/frontends/windows/bitmap.c
+++ b/frontends/windows/bitmap.c
@@ -31,7 +31,7 @@
#include "utils/log.h"
#include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "content/content.h"
#include "windows/plot.h"
diff --git a/frontends/windows/download.c b/frontends/windows/download.c
index b281ea7..f1a0287 100644
--- a/frontends/windows/download.c
+++ b/frontends/windows/download.c
@@ -31,7 +31,7 @@
#include "utils/utils.h"
#include "utils/string.h"
#include "content/fetch.h"
-#include "desktop/gui_download.h"
+#include "netsurf/download.h"
#include "desktop/download.h"
#include "windows/download.h"
diff --git a/frontends/windows/drawable.c b/frontends/windows/drawable.c
index 4480eea..39ecee0 100644
--- a/frontends/windows/drawable.c
+++ b/frontends/windows/drawable.c
@@ -23,9 +23,9 @@
#include <windows.h>
#include <windowsx.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/textinput.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/errors.h"
#include "utils/log.h"
#include "utils/utils.h"
diff --git a/frontends/windows/file.c b/frontends/windows/file.c
index e9eb9ca..5c5b1f0 100644
--- a/frontends/windows/file.c
+++ b/frontends/windows/file.c
@@ -35,7 +35,7 @@
#include "utils/url.h"
#include "utils/file.h"
#include "utils/string.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "windows/file.h"
diff --git a/frontends/windows/filetype.c b/frontends/windows/filetype.c
index b06534d..aab27ea 100644
--- a/frontends/windows/filetype.c
+++ b/frontends/windows/filetype.c
@@ -22,7 +22,7 @@
#include "utils/log.h"
#include "utils/utils.h"
#include "content/fetch.h"
-#include "desktop/gui_fetch.h"
+#include "netsurf/fetch.h"
#include "windows/filetype.h"
diff --git a/frontends/windows/font.c b/frontends/windows/font.c
index f67205a..551a0eb 100644
--- a/frontends/windows/font.c
+++ b/frontends/windows/font.c
@@ -30,8 +30,8 @@
#include "utils/log.h"
#include "utils/nsoption.h"
#include "utils/utf8.h"
-#include "desktop/gui_layout.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/layout.h"
+#include "netsurf/utf8.h"
#include "windows/font.h"
diff --git a/frontends/windows/gui.c b/frontends/windows/gui.c
index 9923ecf..0ab1e32 100644
--- a/frontends/windows/gui.c
+++ b/frontends/windows/gui.c
@@ -31,8 +31,8 @@
#include "utils/url.h"
#include "utils/file.h"
#include "utils/messages.h"
-#include "desktop/browser.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/clipboard.h"
#include "windows/schedule.h"
#include "windows/window.h"
diff --git a/frontends/windows/localhistory.c b/frontends/windows/localhistory.c
index 674f198..ce1877f 100644
--- a/frontends/windows/localhistory.c
+++ b/frontends/windows/localhistory.c
@@ -23,7 +23,7 @@
#include <commctrl.h>
#include "desktop/browser_history.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/frontends/windows/main.c b/frontends/windows/main.c
index df64e48..49aa431 100644
--- a/frontends/windows/main.c
+++ b/frontends/windows/main.c
@@ -30,10 +30,10 @@
#include "utils/file.h"
#include "utils/nsurl.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
-#include "desktop/gui_fetch.h"
-#include "desktop/gui_misc.h"
-#include "desktop/netsurf.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/fetch.h"
+#include "netsurf/misc.h"
+#include "netsurf/netsurf.h"
#include "windows/findfile.h"
#include "windows/file.h"
diff --git a/frontends/windows/plot.c b/frontends/windows/plot.c
index 86870ea..941ec41 100644
--- a/frontends/windows/plot.c
+++ b/frontends/windows/plot.c
@@ -28,9 +28,9 @@
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/utils.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/mouse.h"
+#include "netsurf/window.h"
+#include "netsurf/plotters.h"
#include "windows/bitmap.h"
#include "windows/font.h"
diff --git a/frontends/windows/pointers.c b/frontends/windows/pointers.c
index b5b7454..b796a30 100644
--- a/frontends/windows/pointers.c
+++ b/frontends/windows/pointers.c
@@ -29,8 +29,8 @@
#include "utils/corestrings.h"
#include "utils/url.h"
#include "utils/file.h"
-#include "desktop/browser.h"
-#include "desktop/gui_clipboard.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/clipboard.h"
#include "windows/schedule.h"
#include "windows/window.h"
diff --git a/frontends/windows/window.c b/frontends/windows/window.c
index f5f13fe..bbe0e96 100644
--- a/frontends/windows/window.c
+++ b/frontends/windows/window.c
@@ -30,8 +30,8 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "content/content.h"
-#include "desktop/browser.h"
-#include "desktop/gui_window.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/window.h"
#include "desktop/browser_history.h"
#include "desktop/textinput.h"
diff --git a/frontends/windows/window.h b/frontends/windows/window.h
index ec54287..047cec6 100644
--- a/frontends/windows/window.h
+++ b/frontends/windows/window.h
@@ -22,7 +22,7 @@
/** The window operation function table for win32 */
extern struct gui_window_table *win32_window_table;
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
struct browser_mouse {
struct gui_window *gui;
diff --git a/desktop/browser.h b/include/netsurf/browser_window.h
similarity index 98%
rename from desktop/browser.h
rename to include/netsurf/browser_window.h
index a1ec37a..482dcb9 100644
--- a/desktop/browser.h
+++ b/include/netsurf/browser_window.h
@@ -17,20 +17,19 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Browser window creation and manipulation (interface).
+/**
+ * \file
+ * Browser window creation and manipulation interface.
*/
-#ifndef _NETSURF_DESKTOP_BROWSER_H_
-#define _NETSURF_DESKTOP_BROWSER_H_
+#ifndef _NETSURF_BROWSER_WINDOW_H_
+#define _NETSURF_BROWSER_WINDOW_H_
#include <stdbool.h>
#include <stdio.h>
#include "utils/errors.h"
-#include "desktop/plot_style.h"
-#include "desktop/frame_types.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
struct browser_window;
struct hlcache_handle;
diff --git a/desktop/gui_clipboard.h b/include/netsurf/clipboard.h
similarity index 95%
rename from desktop/gui_clipboard.h
rename to include/netsurf/clipboard.h
index 6feea24..d90ebc4 100644
--- a/desktop/gui_clipboard.h
+++ b/include/netsurf/clipboard.h
@@ -22,8 +22,8 @@
* Interface to platform-specific clipboard operations.
*/
-#ifndef _NETSURF_DESKTOP_GUI_CLIPBOARD_H_
-#define _NETSURF_DESKTOP_GUI_CLIPBOARD_H_
+#ifndef _NETSURF_CLIPBOARD_H_
+#define _NETSURF_CLIPBOARD_H_
#include <stddef.h>
diff --git a/include/netsurf/css.h b/include/netsurf/css.h
index bd95eae..3c7ae28 100644
--- a/include/netsurf/css.h
+++ b/include/netsurf/css.h
@@ -21,8 +21,8 @@
* Netsurf core css API
*/
-#ifndef NETSURF_CSS_H_
-#define NETSURF_CSS_H_
+#ifndef _NETSURF_CSS_H_
+#define _NETSURF_CSS_H_
/**
* Convert a CSS color to a NetSurf colour primitive
diff --git a/desktop/gui_download.h b/include/netsurf/download.h
similarity index 93%
rename from desktop/gui_download.h
rename to include/netsurf/download.h
index 55e115d..ae554db 100644
--- a/desktop/gui_download.h
+++ b/include/netsurf/download.h
@@ -22,8 +22,8 @@
* Interface to platform-specific download operations.
*/
-#ifndef _NETSURF_DESKTOP_GUI_DOWNLOAD_H_
-#define _NETSURF_DESKTOP_GUI_DOWNLOAD_H_
+#ifndef _NETSURF_DOWNLOAD_H_
+#define _NETSURF_DOWNLOAD_H_
struct gui_window;
struct download_context;
diff --git a/desktop/gui_fetch.h b/include/netsurf/fetch.h
similarity index 97%
rename from desktop/gui_fetch.h
rename to include/netsurf/fetch.h
index 22c5e6a..6e6d653 100644
--- a/desktop/gui_fetch.h
+++ b/include/netsurf/fetch.h
@@ -22,8 +22,8 @@
* Interface to platform-specific fetcher operations.
*/
-#ifndef _NETSURF_DESKTOP_GUI_FETCH_H_
-#define _NETSURF_DESKTOP_GUI_FETCH_H_
+#ifndef _NETSURF_FETCH_H_
+#define _NETSURF_FETCH_H_
struct nsurl;
diff --git a/desktop/gui_layout.h b/include/netsurf/layout.h
similarity index 97%
rename from desktop/gui_layout.h
rename to include/netsurf/layout.h
index 1696aee..266de40 100644
--- a/desktop/gui_layout.h
+++ b/include/netsurf/layout.h
@@ -29,8 +29,8 @@
* is the correct approach.
*/
-#ifndef _NETSURF_DESKTOP_GUI_LAYOUT_H_
-#define _NETSURF_DESKTOP_GUI_LAYOUT_H_
+#ifndef _NETSURF_LAYOUT_H_
+#define _NETSURF_LAYOUT_H_
struct plot_font_style;
diff --git a/desktop/gui_misc.h b/include/netsurf/misc.h
similarity index 97%
rename from desktop/gui_misc.h
rename to include/netsurf/misc.h
index 399d938..7b35495 100644
--- a/desktop/gui_misc.h
+++ b/include/netsurf/misc.h
@@ -22,8 +22,8 @@
* Interface to platform-specific miscellaneous browser operation table.
*/
-#ifndef _NETSURF_DESKTOP_GUI_MISC_H_
-#define _NETSURF_DESKTOP_GUI_MISC_H_
+#ifndef _NETSURF_MISC_H_
+#define _NETSURF_MISC_H_
struct form_control;
struct gui_window;
diff --git a/desktop/mouse.h b/include/netsurf/mouse.h
similarity index 88%
rename from desktop/mouse.h
rename to include/netsurf/mouse.h
index 083bd17..19cd3ea 100644
--- a/desktop/mouse.h
+++ b/include/netsurf/mouse.h
@@ -18,12 +18,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Core mouse state.
+/**
+ * \file
+ *
+ * Core mouse and pointer states.
*/
-#ifndef _NETSURF_DESKTOP_MOUSE_H_
-#define _NETSURF_DESKTOP_MOUSE_H_
+#ifndef _NETSURF_MOUSE_H_
+#define _NETSURF_MOUSE_H_
/* Mouse state. 1 is primary mouse button (e.g. Select on RISC OS).
* 2 is secondary mouse button (e.g. Adjust on RISC OS). */
@@ -79,13 +81,26 @@ typedef enum browser_mouse_state {
typedef enum gui_pointer_shape {
- GUI_POINTER_DEFAULT, GUI_POINTER_POINT, GUI_POINTER_CARET,
- GUI_POINTER_MENU, GUI_POINTER_UP, GUI_POINTER_DOWN,
- GUI_POINTER_LEFT, GUI_POINTER_RIGHT, GUI_POINTER_RU,
- GUI_POINTER_LD, GUI_POINTER_LU, GUI_POINTER_RD,
- GUI_POINTER_CROSS, GUI_POINTER_MOVE, GUI_POINTER_WAIT,
- GUI_POINTER_HELP, GUI_POINTER_NO_DROP, GUI_POINTER_NOT_ALLOWED,
- GUI_POINTER_PROGRESS } gui_pointer_shape;
+ GUI_POINTER_DEFAULT,
+ GUI_POINTER_POINT,
+ GUI_POINTER_CARET,
+ GUI_POINTER_MENU,
+ GUI_POINTER_UP,
+ GUI_POINTER_DOWN,
+ GUI_POINTER_LEFT,
+ GUI_POINTER_RIGHT,
+ GUI_POINTER_RU,
+ GUI_POINTER_LD,
+ GUI_POINTER_LU,
+ GUI_POINTER_RD,
+ GUI_POINTER_CROSS,
+ GUI_POINTER_MOVE,
+ GUI_POINTER_WAIT,
+ GUI_POINTER_HELP,
+ GUI_POINTER_NO_DROP,
+ GUI_POINTER_NOT_ALLOWED,
+ GUI_POINTER_PROGRESS
+} gui_pointer_shape;
/** Mouse pointer type */
typedef enum {
diff --git a/desktop/netsurf.h b/include/netsurf/netsurf.h
similarity index 95%
rename from desktop/netsurf.h
rename to include/netsurf/netsurf.h
index ee6e53a..9c9d2b4 100644
--- a/desktop/netsurf.h
+++ b/include/netsurf/netsurf.h
@@ -22,8 +22,8 @@
* NetSurf core interface registration, construction and destruction.
*/
-#ifndef _NETSURF_DESKTOP_NETSURF_H_
-#define _NETSURF_DESKTOP_NETSURF_H_
+#ifndef _NETSURF_NETSURF_H_
+#define _NETSURF_NETSURF_H_
#include "utils/errors.h"
#include "desktop/gui_table.h"
diff --git a/desktop/plotters.h b/include/netsurf/plotters.h
similarity index 97%
rename from desktop/plotters.h
rename to include/netsurf/plotters.h
index d764de2..b13c9b2 100644
--- a/desktop/plotters.h
+++ b/include/netsurf/plotters.h
@@ -16,12 +16,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Target independent plotting (interface).
+/**
+ * \file
+ * Target independent plotting interface.
*/
-#ifndef _NETSURF_DESKTOP_PLOTTERS_H_
-#define _NETSURF_DESKTOP_PLOTTERS_H_
+#ifndef _NETSURF_PLOTTERS_H_
+#define _NETSURF_PLOTTERS_H_
#include <stdbool.h>
#include <stdio.h>
diff --git a/desktop/gui_search.h b/include/netsurf/search.h
similarity index 96%
rename from desktop/gui_search.h
rename to include/netsurf/search.h
index 0b02ac8..1246ea9 100644
--- a/desktop/gui_search.h
+++ b/include/netsurf/search.h
@@ -22,8 +22,8 @@
* Interface to platform-specific search operations.
*/
-#ifndef _NETSURF_DESKTOP_GUI_SEARCH_H_
-#define _NETSURF_DESKTOP_GUI_SEARCH_H_
+#ifndef _NETSURF_SEARCH_H_
+#define _NETSURF_SEARCH_H_
/**
* function table for page text search.
diff --git a/desktop/gui_utf8.h b/include/netsurf/utf8.h
similarity index 95%
rename from desktop/gui_utf8.h
rename to include/netsurf/utf8.h
index c40c4c1..04499e5 100644
--- a/desktop/gui_utf8.h
+++ b/include/netsurf/utf8.h
@@ -22,8 +22,8 @@
* Interface to platform-specific utf8 operations.
*/
-#ifndef _NETSURF_DESKTOP_GUI_UTF8_H_
-#define _NETSURF_DESKTOP_GUI_UTF8_H_
+#ifndef _NETSURF_UTF8_H_
+#define _NETSURF_UTF8_H_
/**
* User interface utf8 characterset conversion routines.
diff --git a/desktop/gui_window.h b/include/netsurf/window.h
similarity index 99%
rename from desktop/gui_window.h
rename to include/netsurf/window.h
index 7ecd3c2..8b3e9c4 100644
--- a/desktop/gui_window.h
+++ b/include/netsurf/window.h
@@ -23,8 +23,8 @@
* operations.
*/
-#ifndef _NETSURF_DESKTOP_GUI_WINDOW_H_
-#define _NETSURF_DESKTOP_GUI_WINDOW_H_
+#ifndef _NETSURF_WINDOW_H_
+#define _NETSURF_WINDOW_H_
typedef enum gui_save_type {
GUI_SAVE_SOURCE,
diff --git a/javascript/duktape/Location.bnd b/javascript/duktape/Location.bnd
index fbb0e4a..ca7e905 100644
--- a/javascript/duktape/Location.bnd
+++ b/javascript/duktape/Location.bnd
@@ -15,7 +15,7 @@ class Location {
prologue Location()
%{
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
%}
init Location(nsurl *url)
diff --git a/javascript/duktape/Window.bnd b/javascript/duktape/Window.bnd
index 81d5280..c9fc3ca 100644
--- a/javascript/duktape/Window.bnd
+++ b/javascript/duktape/Window.bnd
@@ -13,7 +13,7 @@ class Window {
private struct html_content * htmlc;
prologue %{
#include "utils/nsurl.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "render/html.h"
#include "render/html_internal.h"
%};
diff --git a/javascript/jsapi/location.bnd b/javascript/jsapi/location.bnd
index f64f633..96c0a30 100644
--- a/javascript/jsapi/location.bnd
+++ b/javascript/jsapi/location.bnd
@@ -17,7 +17,7 @@ hdrcomment " http://www.opensource.org/licenses/mit-license";
preamble %{
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "utils/config.h"
#include "utils/log.h"
diff --git a/render/box.c b/render/box.c
index 07ea114..81c22ed 100644
--- a/render/box.c
+++ b/render/box.c
@@ -38,7 +38,7 @@
#include "content/handlers/css/utils.h"
#include "content/handlers/css/dump.h"
#include "desktop/scrollbar.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
diff --git a/render/box_construct.c b/render/box_construct.c
index 6dce5c6..372dcb3 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -46,7 +46,7 @@
#include "content/handlers/css/hints.h"
#include "content/handlers/css/select.h"
#include "netsurf/css.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
diff --git a/render/box_textarea.c b/render/box_textarea.c
index 4e4adff..7f07654 100644
--- a/render/box_textarea.c
+++ b/render/box_textarea.c
@@ -22,7 +22,6 @@
#include <dom/dom.h>
-#include "desktop/browser.h"
#include "desktop/textarea.h"
#include "desktop/textinput.h"
#include "utils/log.h"
diff --git a/render/form.c b/render/form.c
index 75d16d8..af571ae 100644
--- a/render/form.c
+++ b/render/form.c
@@ -43,14 +43,14 @@
#include "content/fetch.h"
#include "content/hlcache.h"
#include "content/handlers/css/utils.h"
-#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/mouse.h"
#include "desktop/knockout.h"
#include "desktop/plot_style.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
diff --git a/render/html.c b/render/html.c
index 5090b6f..7e2f271 100644
--- a/render/html.c
+++ b/render/html.c
@@ -48,10 +48,10 @@
#include "desktop/textarea.h"
#include "netsurf/bitmap.h"
#include "javascript/js.h"
-#include "desktop/browser.h"
-#include "desktop/gui_utf8.h"
-#include "desktop/gui_layout.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/utf8.h"
+#include "netsurf/layout.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
diff --git a/render/html.h b/render/html.h
index 215bfbb..5d2e459 100644
--- a/render/html.h
+++ b/render/html.h
@@ -31,8 +31,8 @@
#include <dom/bindings/hubbub/parser.h>
#include "content/content_type.h"
-#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/mouse.h"
#include "desktop/plot_style.h"
#include "desktop/frame_types.h"
diff --git a/render/html_css.c b/render/html_css.c
index 0c8ee33..a3973bf 100644
--- a/render/html_css.c
+++ b/render/html_css.c
@@ -33,7 +33,7 @@
#include "utils/corestrings.h"
#include "utils/config.h"
#include "utils/log.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "render/html_internal.h"
diff --git a/render/html_forms.c b/render/html_forms.c
index fe289f2..0d56e1c 100644
--- a/render/html_forms.c
+++ b/render/html_forms.c
@@ -19,8 +19,6 @@
#include "utils/corestrings.h"
#include "utils/log.h"
-#include "desktop/browser.h"
-
#include "render/form_internal.h"
#include "render/html_internal.h"
diff --git a/render/html_interaction.c b/render/html_interaction.c
index 19e19f6..3a54825 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -35,17 +35,17 @@
#include "utils/log.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/frames.h"
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
#include "utils/nsoption.h"
#include "desktop/scrollbar.h"
#include "desktop/selection.h"
#include "desktop/textarea.h"
#include "desktop/textinput.h"
#include "javascript/js.h"
-#include "desktop/gui_misc.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/misc.h"
+#include "netsurf/layout.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
diff --git a/render/html_object.c b/render/html_object.c
index 9e5e267..baa01e5 100644
--- a/render/html_object.c
+++ b/render/html_object.c
@@ -35,7 +35,7 @@
#include "content/hlcache.h"
#include "content/handlers/css/utils.h"
#include "desktop/scrollbar.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
diff --git a/render/html_redraw.c b/render/html_redraw.c
index cf4bd6f..01e7246 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -42,14 +42,14 @@
#include "utils/nsoption.h"
#include "content/content_protected.h"
#include "content/handlers/css/utils.h"
-#include "desktop/browser.h"
-#include "desktop/plotters.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/plotters.h"
#include "desktop/selection.h"
#include "desktop/print.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
#include "netsurf/bitmap.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
diff --git a/render/layout.c b/render/layout.c
index a7f2e8d..48c8677 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -49,10 +49,10 @@
#include "utils/nsoption.h"
#include "content/content_protected.h"
#include "content/handlers/css/utils.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "render/box.h"
#include "render/font.h"
diff --git a/render/search.c b/render/search.c
index f5e231a..523f8fb 100644
--- a/render/search.c
+++ b/render/search.c
@@ -33,8 +33,8 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/selection.h"
-#include "desktop/gui_search.h"
-#include "desktop/gui_misc.h"
+#include "netsurf/search.h"
+#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
#include "render/box.h"
diff --git a/render/textplain.c b/render/textplain.c
index 5ecf143..80828e7 100644
--- a/render/textplain.c
+++ b/render/textplain.c
@@ -40,13 +40,13 @@
#include "content/content_protected.h"
#include "content/hlcache.h"
#include "content/handlers/css/utils.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "utils/nsoption.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
#include "desktop/search.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
-#include "desktop/gui_layout.h"
+#include "netsurf/layout.h"
#include "desktop/gui_internal.h"
#include "render/search.h"
diff --git a/render/textplain.h b/render/textplain.h
index c3f2a0f..6a88c34 100644
--- a/render/textplain.h
+++ b/render/textplain.h
@@ -25,7 +25,7 @@
#define _NETSURF_RENDER_TEXTPLAIN_H_
#include <stddef.h>
-#include "desktop/mouse.h"
+#include "netsurf/mouse.h"
struct content;
struct hlcache_handle;
diff --git a/test/Makefile b/test/Makefile
index 95e7132..66b8aa7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -80,7 +80,7 @@ TESTCFLAGS := -std=c99 -g -Wall \
-D_BSD_SOURCE \
-D_POSIX_C_SOURCE=200809L \
-D_XOPEN_SOURCE=600 \
- -Itest -Ifrontends -I. -I.. \
+ -Itest -Iinclude -Ifrontends -I. -I.. \
-Dnsgtk \
$(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc libidn) \
$(LIB_CFLAGS) \
diff --git a/utils/utf8.c b/utils/utf8.c
index b1871b2..5c930cd 100644
--- a/utils/utf8.c
+++ b/utils/utf8.c
@@ -32,7 +32,7 @@
#include "utils/log.h"
#include "utils/utf8.h"
-#include "desktop/gui_utf8.h"
+#include "netsurf/utf8.h"
#include "desktop/gui_internal.h"
--
NetSurf Browser
7Â years, 4Â months
- 1
- 0
netsurf: branch master updated. release/3.5-126-g2dab078
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/2dab078f21db7dec5a290...
...commit http://git.netsurf-browser.org/netsurf.git/commit/2dab078f21db7dec5a29079...
...tree http://git.netsurf-browser.org/netsurf.git/tree/2dab078f21db7dec5a29079da...
The branch, master has been updated
via 2dab078f21db7dec5a29079daf9a5f0a06a6e0bd (commit)
from 6722943b81c0dba84ed187b2d117cc92972117ed (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=2dab078f21db7dec5a2...
commit 2dab078f21db7dec5a29079daf9a5f0a06a6e0bd
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
move bitmap API header to core include directory
diff --git a/content/content.c b/content/content.c
index 9b53a49..ad130a5 100644
--- a/content/content.c
+++ b/content/content.c
@@ -33,7 +33,7 @@
#include "desktop/gui_internal.h"
#include "desktop/browser.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "content/content_protected.h"
#include "content/content_debug.h"
#include "content/hlcache.h"
diff --git a/content/handlers/image/bitmap.h b/content/handlers/image/bitmap.h
deleted file mode 100644
index ef6c1b4..0000000
--- a/content/handlers/image/bitmap.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright 2004 James Bursa <bursa(a)users.sourceforge.net>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-/**
- * \file
- * Generic bitmap handling interface.
- *
- * This interface wraps the native platform-specific image format, so that
- * portable image convertors can be written.
- *
- * Bitmaps are required to be 32bpp with components in the order RR GG BB AA.
- *
- * For example, an opaque 1x1 pixel image would yield the following bitmap
- * data:
- *
- * > Red : 0xff 0x00 0x00 0x00
- * > Green: 0x00 0xff 0x00 0x00
- * > Blue : 0x00 0x00 0xff 0x00
- *
- * Any attempt to read pixels by casting bitmap data to uint32_t or similar
- * will need to cater for the order of bytes in a word being different on
- * big and little endian systems. To avoid confusion, it is recommended
- * that pixel data is loaded as follows:
- *
- * uint32_t read_pixel(const uint8_t *bmp)
- * {
- * // red green blue alpha
- * return bmp[0] | (bmp[1] << 8) | (bmp[2] << 16) | (bmp[3] << 24);
- * }
- *
- * and *not* as follows:
- *
- * uint32_t read_pixel(const uint8_t *bmp)
- * {
- * return *((uint32_t *) bmp);
- * }
- */
-
-#ifndef _NETSURF_IMAGE_BITMAP_H_
-#define _NETSURF_IMAGE_BITMAP_H_
-
-#define BITMAP_NEW 0
-#define BITMAP_OPAQUE (1 << 0) /**< image is opaque */
-#define BITMAP_MODIFIED (1 << 1) /**< buffer has been modified */
-#define BITMAP_CLEAR_MEMORY (1 << 2) /**< memory should be wiped */
-
-struct content;
-struct bitmap;
-struct hlcache_handle;
-
-/**
- * Bitmap operations.
- */
-struct gui_bitmap_table {
- /* Mandantory entries */
-
- /**
- * Create a new bitmap.
- *
- * \param width width of image in pixels
- * \param height width of image in pixels
- * \param state The state to create the bitmap in.
- * \return A bitmap structure or NULL on error.
- */
- void *(*create)(int width, int height, unsigned int state);
-
- /**
- * Destroy a bitmap.
- *
- * \param bitmap The bitmap to destroy.
- */
- void (*destroy)(void *bitmap);
-
- /**
- * Set the opacity of a bitmap.
- *
- * \param bitmap The bitmap to set opacity on.
- * \param opaque The bitmap opacity to set.
- */
- void (*set_opaque)(void *bitmap, bool opaque);
-
- /**
- * Get the opacity of a bitmap.
- *
- * \param bitmap The bitmap to examine.
- * \return The bitmap opacity.
- */
- bool (*get_opaque)(void *bitmap);
-
- /**
- * Test if a bitmap is opaque.
- *
- * \param bitmap The bitmap to examine.
- * \return The bitmap opacity.
- */
- bool (*test_opaque)(void *bitmap);
-
- /**
- * Get the image buffer from a bitmap
- *
- * \param bitmap The bitmap to get the buffer from.
- * \return The image buffer or NULL if there is none.
- */
- unsigned char *(*get_buffer)(void *bitmap);
-
- /**
- * Get the number of bytes per row of the image
- *
- * \param bitmap The bitmap
- * \return The number of bytes for a row of the bitmap.
- */
- size_t (*get_rowstride)(void *bitmap);
-
- /**
- * Get the bitmap width
- *
- * \param bitmap The bitmap
- * \return The bitmap width in pixels.
- */
- int (*get_width)(void *bitmap);
-
- /**
- * Get the bitmap height
- *
- * \param bitmap The bitmap
- * \return The bitmap height in pixels.
- */
- int (*get_height)(void *bitmap);
-
- /**
- * The the *bytes* per pixel.
- *
- * \param bitmap The bitmap
- */
- size_t (*get_bpp)(void *bitmap);
-
- /**
- * Savde a bitmap to disc.
- *
- * \param bitmap The bitmap to save
- * \param path The path to save the bitmap to.
- * \param flags Flags affectin the save.
- */
- bool (*save)(void *bitmap, const char *path, unsigned flags);
-
- /**
- * Marks a bitmap as modified.
- *
- * \param bitmap The bitmap set as modified.
- */
- void (*modified)(void *bitmap);
-
- /**
- * Render content into a bitmap.
- *
- * \param bitmap The bitmap to render into.
- * \param content The content to render.
- */
- nserror (*render)(struct bitmap *bitmap, struct hlcache_handle *content);
-};
-
-#endif
diff --git a/content/handlers/image/bmp.c b/content/handlers/image/bmp.c
index f622f6c..e108b48 100644
--- a/content/handlers/image/bmp.c
+++ b/content/handlers/image/bmp.c
@@ -31,8 +31,8 @@
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
#include "desktop/plotters.h"
+#include "netsurf/bitmap.h"
-#include "bitmap.h"
#include "bmp.h"
/** bmp context. */
diff --git a/content/handlers/image/gif.c b/content/handlers/image/gif.c
index d8d968e..1167266 100644
--- a/content/handlers/image/gif.c
+++ b/content/handlers/image/gif.c
@@ -42,9 +42,9 @@
#include "content/content_protected.h"
#include "desktop/gui_misc.h"
#include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
#include "image.h"
-#include "bitmap.h"
#include "gif.h"
typedef struct nsgif_content {
diff --git a/content/handlers/image/ico.c b/content/handlers/image/ico.c
index d364fdf..5ea29bf 100644
--- a/content/handlers/image/ico.c
+++ b/content/handlers/image/ico.c
@@ -29,9 +29,9 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
#include "image.h"
-#include "bitmap.h"
#include "ico.h"
typedef struct nsico_content {
diff --git a/content/handlers/image/image.c b/content/handlers/image/image.c
index d174369..487b35b 100644
--- a/content/handlers/image/image.c
+++ b/content/handlers/image/image.c
@@ -25,8 +25,8 @@
#include "content/content.h"
#include "desktop/plotters.h"
#include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
-#include "bitmap.h"
#include "bmp.h"
#include "gif.h"
#include "ico.h"
diff --git a/content/handlers/image/image_cache.c b/content/handlers/image/image_cache.c
index 49370ad..52b3b34 100644
--- a/content/handlers/image/image_cache.c
+++ b/content/handlers/image/image_cache.c
@@ -28,8 +28,8 @@
#include "content/content_protected.h"
#include "desktop/gui_misc.h"
#include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
-#include "bitmap.h"
#include "image_cache.h"
#include "image.h"
diff --git a/content/handlers/image/jpeg.c b/content/handlers/image/jpeg.c
index b5eade3..179b8fc 100644
--- a/content/handlers/image/jpeg.c
+++ b/content/handlers/image/jpeg.c
@@ -32,9 +32,9 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
#include "image_cache.h"
-#include "bitmap.h"
#define JPEG_INTERNAL_OPTIONS
#include "jpeglib.h"
diff --git a/content/handlers/image/nssprite.c b/content/handlers/image/nssprite.c
index fd651e0..082bf9e 100644
--- a/content/handlers/image/nssprite.c
+++ b/content/handlers/image/nssprite.c
@@ -31,8 +31,8 @@
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
#include "desktop/plotters.h"
+#include "netsurf/bitmap.h"
-#include "bitmap.h"
#include "nssprite.h"
typedef struct nssprite_content {
diff --git a/content/handlers/image/png.c b/content/handlers/image/png.c
index 4f6f17d..04083d8 100644
--- a/content/handlers/image/png.c
+++ b/content/handlers/image/png.c
@@ -27,9 +27,9 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
#include "image_cache.h"
-#include "bitmap.h"
#include "png.h"
/* accommodate for old versions of libpng (beware security holes!) */
diff --git a/content/handlers/image/rsvg.c b/content/handlers/image/rsvg.c
index bd77368..dce1ea9 100644
--- a/content/handlers/image/rsvg.c
+++ b/content/handlers/image/rsvg.c
@@ -44,8 +44,8 @@
#include "content/content_protected.h"
#include "desktop/plotters.h"
#include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
-#include "bitmap.h"
#include "rsvg.h"
typedef struct rsvg_content {
diff --git a/content/urldb.c b/content/urldb.c
index b11ec98..5230438 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -104,7 +104,7 @@
#include "utils/utils.h"
#include "utils/bloom.h"
#include "utils/time.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/cookie_manager.h"
#include "desktop/gui_internal.h"
diff --git a/desktop/browser_history.c b/desktop/browser_history.c
index b3d12d5..871cc3e 100644
--- a/desktop/browser_history.c
+++ b/desktop/browser_history.c
@@ -34,7 +34,7 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/gui_layout.h"
#include "desktop/gui_internal.h"
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index f43e1c9..07848ee 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -23,7 +23,7 @@
#include "utils/config.h"
#include "utils/errors.h"
#include "utils/file.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "content/hlcache.h"
#include "content/backing_store.h"
diff --git a/desktop/knockout.c b/desktop/knockout.c
index 22aac86..a20ec28 100644
--- a/desktop/knockout.c
+++ b/desktop/knockout.c
@@ -69,7 +69,7 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/errors.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "content/content.h"
#include "desktop/gui_internal.h"
diff --git a/desktop/save_pdf.c b/desktop/save_pdf.c
index 40082f2..0c870b4 100644
--- a/desktop/save_pdf.c
+++ b/desktop/save_pdf.c
@@ -60,7 +60,7 @@
#include "utils/useragent.h"
#include "content/hlcache.h"
#include "utils/nsoption.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/plotters.h"
#include "desktop/print.h"
diff --git a/desktop/treeview.c b/desktop/treeview.c
index c12ecd9..ec2a513 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -23,7 +23,7 @@
*/
#include "utils/log.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "content/hlcache.h"
#include "content/handlers/css/utils.h"
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index 62a5fdf..cf342d8 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -50,7 +50,7 @@
#include "content/hlcache.h"
#include "desktop/mouse.h"
#include "desktop/gui_window.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "amiga/gui.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/dt_anim.c b/frontends/amiga/dt_anim.c
index 8246099..fec7076 100644
--- a/frontends/amiga/dt_anim.c
+++ b/frontends/amiga/dt_anim.c
@@ -39,7 +39,7 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "amiga/bitmap.h"
#include "amiga/filetype.h"
diff --git a/frontends/amiga/dt_picture.c b/frontends/amiga/dt_picture.c
index 6d7d5aa..aba0893 100644
--- a/frontends/amiga/dt_picture.c
+++ b/frontends/amiga/dt_picture.c
@@ -35,7 +35,7 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "content/handlers/image/image_cache.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c
index 8163612..819879d 100644
--- a/frontends/amiga/icon.c
+++ b/frontends/amiga/icon.c
@@ -42,7 +42,7 @@
#include "utils/utils.h"
#include "utils/file.h"
#include "desktop/plotters.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "content/content_protected.h"
#include "amiga/os3support.h"
diff --git a/frontends/atari/bitmap.c b/frontends/atari/bitmap.c
index 680fe97..35886c0 100644
--- a/frontends/atari/bitmap.c
+++ b/frontends/atari/bitmap.c
@@ -24,7 +24,7 @@
#include "utils/nsoption.h"
#include "utils/log.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/mouse.h"
#include "atari/bitmap.h"
diff --git a/frontends/atari/plot/plot.c b/frontends/atari/plot/plot.c
index 4f4d08c..f96039d 100644
--- a/frontends/atari/plot/plot.c
+++ b/frontends/atari/plot/plot.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/utils.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/plotters.h"
#include "desktop/mouse.h"
diff --git a/frontends/beos/bitmap.cpp b/frontends/beos/bitmap.cpp
index 7adaae7..c9c786a 100644
--- a/frontends/beos/bitmap.cpp
+++ b/frontends/beos/bitmap.cpp
@@ -42,7 +42,7 @@ extern "C" {
#include "content/urldb.h"
#include "desktop/plotters.h"
#include "desktop/browser.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
}
#include "beos/bitmap.h"
diff --git a/frontends/cocoa/apple_image.m b/frontends/cocoa/apple_image.m
index 4f8deeb..896cf4c 100644
--- a/frontends/cocoa/apple_image.m
+++ b/frontends/cocoa/apple_image.m
@@ -22,7 +22,7 @@
#include "utils/config.h"
#include "content/content_protected.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/plotters.h"
#include "utils/utils.h"
diff --git a/frontends/cocoa/bitmap.m b/frontends/cocoa/bitmap.m
index 5905eeb..14394d0 100644
--- a/frontends/cocoa/bitmap.m
+++ b/frontends/cocoa/bitmap.m
@@ -25,7 +25,7 @@
#import "desktop/browser.h"
#import "desktop/plotters.h"
-#import "content/handlers/image/bitmap.h"
+#import "netsurf/bitmap.h"
#import "content/urldb.h"
#import "content/content.h"
diff --git a/frontends/framebuffer/bitmap.c b/frontends/framebuffer/bitmap.c
index 925b6fe..df99e71 100644
--- a/frontends/framebuffer/bitmap.c
+++ b/frontends/framebuffer/bitmap.c
@@ -30,7 +30,7 @@
#include "utils/log.h"
#include "utils/utils.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/plotters.h"
#include "content/content.h"
diff --git a/frontends/framebuffer/framebuffer.c b/frontends/framebuffer/framebuffer.c
index bd94403..16e9dd7 100644
--- a/frontends/framebuffer/framebuffer.c
+++ b/frontends/framebuffer/framebuffer.c
@@ -33,7 +33,7 @@
#include "utils/utf8.h"
#include "desktop/browser.h"
#include "desktop/plotters.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/gtk/bitmap.c b/frontends/gtk/bitmap.c
index 08dee61..ff5a0c4 100644
--- a/frontends/gtk/bitmap.c
+++ b/frontends/gtk/bitmap.c
@@ -33,7 +33,7 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "content/content.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/plotters.h"
#include "gtk/scaffolding.h"
diff --git a/frontends/monkey/bitmap.c b/frontends/monkey/bitmap.c
index daf90b4..3313e11 100644
--- a/frontends/monkey/bitmap.c
+++ b/frontends/monkey/bitmap.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include "utils/errors.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "monkey/bitmap.h"
diff --git a/frontends/riscos/bitmap.c b/frontends/riscos/bitmap.c
index b56000f..525a230 100644
--- a/frontends/riscos/bitmap.c
+++ b/frontends/riscos/bitmap.c
@@ -45,7 +45,7 @@
#include "utils/messages.h"
#include "desktop/plotters.h"
#include "content/content.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "riscos/gui.h"
#include "riscos/image.h"
diff --git a/frontends/riscos/save.c b/frontends/riscos/save.c
index 468ede6..0432b1a 100644
--- a/frontends/riscos/save.c
+++ b/frontends/riscos/save.c
@@ -49,7 +49,7 @@
#include "desktop/save_complete.h"
#include "desktop/save_text.h"
#include "desktop/gui_window.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "render/form.h"
#include "riscos/bitmap.h"
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index ff89027..b6d074f 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -65,7 +65,7 @@
#include "desktop/textinput.h"
#include "desktop/tree.h"
#include "desktop/gui_window.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "render/form.h"
#include "riscos/bitmap.h"
diff --git a/frontends/windows/bitmap.c b/frontends/windows/bitmap.c
index 1a78561..a50d9aa 100644
--- a/frontends/windows/bitmap.c
+++ b/frontends/windows/bitmap.c
@@ -30,7 +30,7 @@
#include <windows.h>
#include "utils/log.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/plotters.h"
#include "content/content.h"
diff --git a/include/netsurf/bitmap.h b/include/netsurf/bitmap.h
new file mode 100644
index 0000000..e54bdff
--- /dev/null
+++ b/include/netsurf/bitmap.h
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2004 James Bursa <bursa(a)users.sourceforge.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+/**
+ * \file
+ * Generic bitmap handling interface.
+ *
+ * This interface wraps the native platform-specific image format, so that
+ * portable image convertors can be written.
+ *
+ * Bitmaps are required to be 32bpp with components in the order RR GG BB AA.
+ *
+ * For example, an opaque 1x1 pixel image would yield the following bitmap
+ * data:
+ *
+ * > Red : 0xff 0x00 0x00 0x00
+ * > Green: 0x00 0xff 0x00 0x00
+ * > Blue : 0x00 0x00 0xff 0x00
+ *
+ * Any attempt to read pixels by casting bitmap data to uint32_t or similar
+ * will need to cater for the order of bytes in a word being different on
+ * big and little endian systems. To avoid confusion, it is recommended
+ * that pixel data is loaded as follows:
+ *
+ * uint32_t read_pixel(const uint8_t *bmp)
+ * {
+ * // red green blue alpha
+ * return bmp[0] | (bmp[1] << 8) | (bmp[2] << 16) | (bmp[3] << 24);
+ * }
+ *
+ * and *not* as follows:
+ *
+ * uint32_t read_pixel(const uint8_t *bmp)
+ * {
+ * return *((uint32_t *) bmp);
+ * }
+ */
+
+#ifndef _NETSURF_BITMAP_H_
+#define _NETSURF_BITMAP_H_
+
+#define BITMAP_NEW 0
+#define BITMAP_OPAQUE (1 << 0) /**< image is opaque */
+#define BITMAP_MODIFIED (1 << 1) /**< buffer has been modified */
+#define BITMAP_CLEAR_MEMORY (1 << 2) /**< memory should be wiped */
+
+struct content;
+struct bitmap;
+struct hlcache_handle;
+
+/**
+ * Bitmap operations.
+ */
+struct gui_bitmap_table {
+ /* Mandantory entries */
+
+ /**
+ * Create a new bitmap.
+ *
+ * \param width width of image in pixels
+ * \param height width of image in pixels
+ * \param state The state to create the bitmap in.
+ * \return A bitmap structure or NULL on error.
+ */
+ void *(*create)(int width, int height, unsigned int state);
+
+ /**
+ * Destroy a bitmap.
+ *
+ * \param bitmap The bitmap to destroy.
+ */
+ void (*destroy)(void *bitmap);
+
+ /**
+ * Set the opacity of a bitmap.
+ *
+ * \param bitmap The bitmap to set opacity on.
+ * \param opaque The bitmap opacity to set.
+ */
+ void (*set_opaque)(void *bitmap, bool opaque);
+
+ /**
+ * Get the opacity of a bitmap.
+ *
+ * \param bitmap The bitmap to examine.
+ * \return The bitmap opacity.
+ */
+ bool (*get_opaque)(void *bitmap);
+
+ /**
+ * Test if a bitmap is opaque.
+ *
+ * \param bitmap The bitmap to examine.
+ * \return The bitmap opacity.
+ */
+ bool (*test_opaque)(void *bitmap);
+
+ /**
+ * Get the image buffer from a bitmap
+ *
+ * \param bitmap The bitmap to get the buffer from.
+ * \return The image buffer or NULL if there is none.
+ */
+ unsigned char *(*get_buffer)(void *bitmap);
+
+ /**
+ * Get the number of bytes per row of the image
+ *
+ * \param bitmap The bitmap
+ * \return The number of bytes for a row of the bitmap.
+ */
+ size_t (*get_rowstride)(void *bitmap);
+
+ /**
+ * Get the bitmap width
+ *
+ * \param bitmap The bitmap
+ * \return The bitmap width in pixels.
+ */
+ int (*get_width)(void *bitmap);
+
+ /**
+ * Get the bitmap height
+ *
+ * \param bitmap The bitmap
+ * \return The bitmap height in pixels.
+ */
+ int (*get_height)(void *bitmap);
+
+ /**
+ * The the *bytes* per pixel.
+ *
+ * \param bitmap The bitmap
+ */
+ size_t (*get_bpp)(void *bitmap);
+
+ /**
+ * Savde a bitmap to disc.
+ *
+ * \param bitmap The bitmap to save
+ * \param path The path to save the bitmap to.
+ * \param flags Flags affectin the save.
+ */
+ bool (*save)(void *bitmap, const char *path, unsigned flags);
+
+ /**
+ * Marks a bitmap as modified.
+ *
+ * \param bitmap The bitmap set as modified.
+ */
+ void (*modified)(void *bitmap);
+
+ /**
+ * Render content into a bitmap.
+ *
+ * \param bitmap The bitmap to render into.
+ * \param content The content to render.
+ */
+ nserror (*render)(struct bitmap *bitmap, struct hlcache_handle *content);
+};
+
+#endif
diff --git a/render/html.c b/render/html.c
index ecbd99c..5090b6f 100644
--- a/render/html.c
+++ b/render/html.c
@@ -46,7 +46,7 @@
#include "desktop/selection.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "javascript/js.h"
#include "desktop/browser.h"
#include "desktop/gui_utf8.h"
diff --git a/render/html_redraw.c b/render/html_redraw.c
index 7f8391c..cf4bd6f 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -48,7 +48,7 @@
#include "desktop/print.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/gui_layout.h"
#include "desktop/gui_internal.h"
diff --git a/test/urldbtest.c b/test/urldbtest.c
index efe33be..820dc6b 100644
--- a/test/urldbtest.c
+++ b/test/urldbtest.c
@@ -30,7 +30,7 @@
#include <curl/curl.h>
#include "utils/errors.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "content/content.h"
#include "content/urldb.h"
#include "desktop/cookie_manager.h"
-----------------------------------------------------------------------
Summary of changes:
content/content.c | 2 +-
content/handlers/image/bmp.c | 2 +-
content/handlers/image/gif.c | 2 +-
content/handlers/image/ico.c | 2 +-
content/handlers/image/image.c | 2 +-
content/handlers/image/image_cache.c | 2 +-
content/handlers/image/jpeg.c | 2 +-
content/handlers/image/nssprite.c | 2 +-
content/handlers/image/png.c | 2 +-
content/handlers/image/rsvg.c | 2 +-
content/urldb.c | 2 +-
desktop/browser_history.c | 2 +-
desktop/gui_factory.c | 2 +-
desktop/knockout.c | 2 +-
desktop/save_pdf.c | 2 +-
desktop/treeview.c | 2 +-
frontends/amiga/bitmap.c | 2 +-
frontends/amiga/dt_anim.c | 2 +-
frontends/amiga/dt_picture.c | 2 +-
frontends/amiga/icon.c | 2 +-
frontends/atari/bitmap.c | 2 +-
frontends/atari/plot/plot.c | 2 +-
frontends/beos/bitmap.cpp | 2 +-
frontends/cocoa/apple_image.m | 2 +-
frontends/cocoa/bitmap.m | 2 +-
frontends/framebuffer/bitmap.c | 2 +-
frontends/framebuffer/framebuffer.c | 2 +-
frontends/gtk/bitmap.c | 2 +-
frontends/monkey/bitmap.c | 2 +-
frontends/riscos/bitmap.c | 2 +-
frontends/riscos/save.c | 2 +-
frontends/riscos/window.c | 2 +-
frontends/windows/bitmap.c | 2 +-
{content/handlers/image => include/netsurf}/bitmap.h | 4 ++--
render/html.c | 2 +-
render/html_redraw.c | 2 +-
test/urldbtest.c | 2 +-
37 files changed, 38 insertions(+), 38 deletions(-)
rename {content/handlers/image => include/netsurf}/bitmap.h (98%)
diff --git a/content/content.c b/content/content.c
index 9b53a49..ad130a5 100644
--- a/content/content.c
+++ b/content/content.c
@@ -33,7 +33,7 @@
#include "desktop/gui_internal.h"
#include "desktop/browser.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "content/content_protected.h"
#include "content/content_debug.h"
#include "content/hlcache.h"
diff --git a/content/handlers/image/bmp.c b/content/handlers/image/bmp.c
index f622f6c..e108b48 100644
--- a/content/handlers/image/bmp.c
+++ b/content/handlers/image/bmp.c
@@ -31,8 +31,8 @@
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
#include "desktop/plotters.h"
+#include "netsurf/bitmap.h"
-#include "bitmap.h"
#include "bmp.h"
/** bmp context. */
diff --git a/content/handlers/image/gif.c b/content/handlers/image/gif.c
index d8d968e..1167266 100644
--- a/content/handlers/image/gif.c
+++ b/content/handlers/image/gif.c
@@ -42,9 +42,9 @@
#include "content/content_protected.h"
#include "desktop/gui_misc.h"
#include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
#include "image.h"
-#include "bitmap.h"
#include "gif.h"
typedef struct nsgif_content {
diff --git a/content/handlers/image/ico.c b/content/handlers/image/ico.c
index d364fdf..5ea29bf 100644
--- a/content/handlers/image/ico.c
+++ b/content/handlers/image/ico.c
@@ -29,9 +29,9 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
#include "image.h"
-#include "bitmap.h"
#include "ico.h"
typedef struct nsico_content {
diff --git a/content/handlers/image/image.c b/content/handlers/image/image.c
index d174369..487b35b 100644
--- a/content/handlers/image/image.c
+++ b/content/handlers/image/image.c
@@ -25,8 +25,8 @@
#include "content/content.h"
#include "desktop/plotters.h"
#include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
-#include "bitmap.h"
#include "bmp.h"
#include "gif.h"
#include "ico.h"
diff --git a/content/handlers/image/image_cache.c b/content/handlers/image/image_cache.c
index 49370ad..52b3b34 100644
--- a/content/handlers/image/image_cache.c
+++ b/content/handlers/image/image_cache.c
@@ -28,8 +28,8 @@
#include "content/content_protected.h"
#include "desktop/gui_misc.h"
#include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
-#include "bitmap.h"
#include "image_cache.h"
#include "image.h"
diff --git a/content/handlers/image/jpeg.c b/content/handlers/image/jpeg.c
index b5eade3..179b8fc 100644
--- a/content/handlers/image/jpeg.c
+++ b/content/handlers/image/jpeg.c
@@ -32,9 +32,9 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
#include "image_cache.h"
-#include "bitmap.h"
#define JPEG_INTERNAL_OPTIONS
#include "jpeglib.h"
diff --git a/content/handlers/image/nssprite.c b/content/handlers/image/nssprite.c
index fd651e0..082bf9e 100644
--- a/content/handlers/image/nssprite.c
+++ b/content/handlers/image/nssprite.c
@@ -31,8 +31,8 @@
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
#include "desktop/plotters.h"
+#include "netsurf/bitmap.h"
-#include "bitmap.h"
#include "nssprite.h"
typedef struct nssprite_content {
diff --git a/content/handlers/image/png.c b/content/handlers/image/png.c
index 4f6f17d..04083d8 100644
--- a/content/handlers/image/png.c
+++ b/content/handlers/image/png.c
@@ -27,9 +27,9 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
#include "image_cache.h"
-#include "bitmap.h"
#include "png.h"
/* accommodate for old versions of libpng (beware security holes!) */
diff --git a/content/handlers/image/rsvg.c b/content/handlers/image/rsvg.c
index bd77368..dce1ea9 100644
--- a/content/handlers/image/rsvg.c
+++ b/content/handlers/image/rsvg.c
@@ -44,8 +44,8 @@
#include "content/content_protected.h"
#include "desktop/plotters.h"
#include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
-#include "bitmap.h"
#include "rsvg.h"
typedef struct rsvg_content {
diff --git a/content/urldb.c b/content/urldb.c
index b11ec98..5230438 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -104,7 +104,7 @@
#include "utils/utils.h"
#include "utils/bloom.h"
#include "utils/time.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/cookie_manager.h"
#include "desktop/gui_internal.h"
diff --git a/desktop/browser_history.c b/desktop/browser_history.c
index b3d12d5..871cc3e 100644
--- a/desktop/browser_history.c
+++ b/desktop/browser_history.c
@@ -34,7 +34,7 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/gui_layout.h"
#include "desktop/gui_internal.h"
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index f43e1c9..07848ee 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -23,7 +23,7 @@
#include "utils/config.h"
#include "utils/errors.h"
#include "utils/file.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "content/hlcache.h"
#include "content/backing_store.h"
diff --git a/desktop/knockout.c b/desktop/knockout.c
index 22aac86..a20ec28 100644
--- a/desktop/knockout.c
+++ b/desktop/knockout.c
@@ -69,7 +69,7 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/errors.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "content/content.h"
#include "desktop/gui_internal.h"
diff --git a/desktop/save_pdf.c b/desktop/save_pdf.c
index 40082f2..0c870b4 100644
--- a/desktop/save_pdf.c
+++ b/desktop/save_pdf.c
@@ -60,7 +60,7 @@
#include "utils/useragent.h"
#include "content/hlcache.h"
#include "utils/nsoption.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/plotters.h"
#include "desktop/print.h"
diff --git a/desktop/treeview.c b/desktop/treeview.c
index c12ecd9..ec2a513 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -23,7 +23,7 @@
*/
#include "utils/log.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "content/hlcache.h"
#include "content/handlers/css/utils.h"
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index 62a5fdf..cf342d8 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -50,7 +50,7 @@
#include "content/hlcache.h"
#include "desktop/mouse.h"
#include "desktop/gui_window.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "amiga/gui.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/dt_anim.c b/frontends/amiga/dt_anim.c
index 8246099..fec7076 100644
--- a/frontends/amiga/dt_anim.c
+++ b/frontends/amiga/dt_anim.c
@@ -39,7 +39,7 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "amiga/bitmap.h"
#include "amiga/filetype.h"
diff --git a/frontends/amiga/dt_picture.c b/frontends/amiga/dt_picture.c
index 6d7d5aa..aba0893 100644
--- a/frontends/amiga/dt_picture.c
+++ b/frontends/amiga/dt_picture.c
@@ -35,7 +35,7 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "content/handlers/image/image_cache.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c
index 8163612..819879d 100644
--- a/frontends/amiga/icon.c
+++ b/frontends/amiga/icon.c
@@ -42,7 +42,7 @@
#include "utils/utils.h"
#include "utils/file.h"
#include "desktop/plotters.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "content/content_protected.h"
#include "amiga/os3support.h"
diff --git a/frontends/atari/bitmap.c b/frontends/atari/bitmap.c
index 680fe97..35886c0 100644
--- a/frontends/atari/bitmap.c
+++ b/frontends/atari/bitmap.c
@@ -24,7 +24,7 @@
#include "utils/nsoption.h"
#include "utils/log.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/mouse.h"
#include "atari/bitmap.h"
diff --git a/frontends/atari/plot/plot.c b/frontends/atari/plot/plot.c
index 4f4d08c..f96039d 100644
--- a/frontends/atari/plot/plot.c
+++ b/frontends/atari/plot/plot.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/utils.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/plotters.h"
#include "desktop/mouse.h"
diff --git a/frontends/beos/bitmap.cpp b/frontends/beos/bitmap.cpp
index 7adaae7..c9c786a 100644
--- a/frontends/beos/bitmap.cpp
+++ b/frontends/beos/bitmap.cpp
@@ -42,7 +42,7 @@ extern "C" {
#include "content/urldb.h"
#include "desktop/plotters.h"
#include "desktop/browser.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
}
#include "beos/bitmap.h"
diff --git a/frontends/cocoa/apple_image.m b/frontends/cocoa/apple_image.m
index 4f8deeb..896cf4c 100644
--- a/frontends/cocoa/apple_image.m
+++ b/frontends/cocoa/apple_image.m
@@ -22,7 +22,7 @@
#include "utils/config.h"
#include "content/content_protected.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/plotters.h"
#include "utils/utils.h"
diff --git a/frontends/cocoa/bitmap.m b/frontends/cocoa/bitmap.m
index 5905eeb..14394d0 100644
--- a/frontends/cocoa/bitmap.m
+++ b/frontends/cocoa/bitmap.m
@@ -25,7 +25,7 @@
#import "desktop/browser.h"
#import "desktop/plotters.h"
-#import "content/handlers/image/bitmap.h"
+#import "netsurf/bitmap.h"
#import "content/urldb.h"
#import "content/content.h"
diff --git a/frontends/framebuffer/bitmap.c b/frontends/framebuffer/bitmap.c
index 925b6fe..df99e71 100644
--- a/frontends/framebuffer/bitmap.c
+++ b/frontends/framebuffer/bitmap.c
@@ -30,7 +30,7 @@
#include "utils/log.h"
#include "utils/utils.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/plotters.h"
#include "content/content.h"
diff --git a/frontends/framebuffer/framebuffer.c b/frontends/framebuffer/framebuffer.c
index bd94403..16e9dd7 100644
--- a/frontends/framebuffer/framebuffer.c
+++ b/frontends/framebuffer/framebuffer.c
@@ -33,7 +33,7 @@
#include "utils/utf8.h"
#include "desktop/browser.h"
#include "desktop/plotters.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/gtk/bitmap.c b/frontends/gtk/bitmap.c
index 08dee61..ff5a0c4 100644
--- a/frontends/gtk/bitmap.c
+++ b/frontends/gtk/bitmap.c
@@ -33,7 +33,7 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "content/content.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/plotters.h"
#include "gtk/scaffolding.h"
diff --git a/frontends/monkey/bitmap.c b/frontends/monkey/bitmap.c
index daf90b4..3313e11 100644
--- a/frontends/monkey/bitmap.c
+++ b/frontends/monkey/bitmap.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include "utils/errors.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "monkey/bitmap.h"
diff --git a/frontends/riscos/bitmap.c b/frontends/riscos/bitmap.c
index b56000f..525a230 100644
--- a/frontends/riscos/bitmap.c
+++ b/frontends/riscos/bitmap.c
@@ -45,7 +45,7 @@
#include "utils/messages.h"
#include "desktop/plotters.h"
#include "content/content.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "riscos/gui.h"
#include "riscos/image.h"
diff --git a/frontends/riscos/save.c b/frontends/riscos/save.c
index 468ede6..0432b1a 100644
--- a/frontends/riscos/save.c
+++ b/frontends/riscos/save.c
@@ -49,7 +49,7 @@
#include "desktop/save_complete.h"
#include "desktop/save_text.h"
#include "desktop/gui_window.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "render/form.h"
#include "riscos/bitmap.h"
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index ff89027..b6d074f 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -65,7 +65,7 @@
#include "desktop/textinput.h"
#include "desktop/tree.h"
#include "desktop/gui_window.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "render/form.h"
#include "riscos/bitmap.h"
diff --git a/frontends/windows/bitmap.c b/frontends/windows/bitmap.c
index 1a78561..a50d9aa 100644
--- a/frontends/windows/bitmap.c
+++ b/frontends/windows/bitmap.c
@@ -30,7 +30,7 @@
#include <windows.h>
#include "utils/log.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/plotters.h"
#include "content/content.h"
diff --git a/content/handlers/image/bitmap.h b/include/netsurf/bitmap.h
similarity index 98%
rename from content/handlers/image/bitmap.h
rename to include/netsurf/bitmap.h
index ef6c1b4..e54bdff 100644
--- a/content/handlers/image/bitmap.h
+++ b/include/netsurf/bitmap.h
@@ -51,8 +51,8 @@
* }
*/
-#ifndef _NETSURF_IMAGE_BITMAP_H_
-#define _NETSURF_IMAGE_BITMAP_H_
+#ifndef _NETSURF_BITMAP_H_
+#define _NETSURF_BITMAP_H_
#define BITMAP_NEW 0
#define BITMAP_OPAQUE (1 << 0) /**< image is opaque */
diff --git a/render/html.c b/render/html.c
index ecbd99c..5090b6f 100644
--- a/render/html.c
+++ b/render/html.c
@@ -46,7 +46,7 @@
#include "desktop/selection.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "javascript/js.h"
#include "desktop/browser.h"
#include "desktop/gui_utf8.h"
diff --git a/render/html_redraw.c b/render/html_redraw.c
index 7f8391c..cf4bd6f 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -48,7 +48,7 @@
#include "desktop/print.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "desktop/gui_layout.h"
#include "desktop/gui_internal.h"
diff --git a/test/urldbtest.c b/test/urldbtest.c
index efe33be..820dc6b 100644
--- a/test/urldbtest.c
+++ b/test/urldbtest.c
@@ -30,7 +30,7 @@
#include <curl/curl.h>
#include "utils/errors.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
#include "content/content.h"
#include "content/urldb.h"
#include "desktop/cookie_manager.h"
--
NetSurf Browser
7Â years, 4Â months
- 1
- 0
netsurf: branch master updated. release/3.5-125-g6722943
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/6722943b81c0dba84ed18...
...commit http://git.netsurf-browser.org/netsurf.git/commit/6722943b81c0dba84ed187b...
...tree http://git.netsurf-browser.org/netsurf.git/tree/6722943b81c0dba84ed187b2d...
The branch, master has been updated
via 6722943b81c0dba84ed187b2d117cc92972117ed (commit)
from c25eb6b7e7a08d7e2aaf33994c2c24053cf47b82 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=6722943b81c0dba84ed...
commit 6722943b81c0dba84ed187b2d117cc92972117ed
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
move the CSS content handler
diff --git a/Docs/Doxyfile b/Docs/Doxyfile
index 5b8b253..24cc3da 100644
--- a/Docs/Doxyfile
+++ b/Docs/Doxyfile
@@ -672,12 +672,13 @@ INPUT = frontends/amiga \
frontends/riscos/templates \
frontends/riscos/scripts \
frontends/windows \
- css \
+ include/netsurf \
render \
desktop \
content \
content/fetchers \
content/handlers/image \
+ content/handlers/css \
javascript \
javascript/jsapi \
utils \
diff --git a/Makefile b/Makefile
index 35e734e..fe97f1c 100644
--- a/Makefile
+++ b/Makefile
@@ -539,8 +539,8 @@ $(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG))
$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite))
# add top level and build directory to include search path
-CFLAGS += -I. -Ifrontends -I$(OBJROOT)
-CXXFLAGS += -I. -Ifrontends -I$(OBJROOT)
+CFLAGS += -I. -Iinclude -Ifrontends -I$(OBJROOT)
+CXXFLAGS += -I. -Iinclude -Ifrontends -I$(OBJROOT)
# export the user agent format
CFLAGS += -DNETSURF_UA_FORMAT_STRING=\"$(NETSURF_UA_FORMAT_STRING)\"
@@ -585,9 +585,6 @@ include frontends/Makefile
# Content sources
include content/Makefile
-# CSS sources
-include css/Makefile
-
# render sources
include render/Makefile
diff --git a/content/handlers/Makefile b/content/handlers/Makefile
index 97d2813..a12d8cc 100644
--- a/content/handlers/Makefile
+++ b/content/handlers/Makefile
@@ -1,4 +1,9 @@
# Image content handler sources
include content/handlers/image/Makefile
-S_IMAGE := $(addprefix content/handlers/,$(S_IMAGE))
+S_IMAGE := $(addprefix content/handlers/image/,$(S_IMAGE))
+
+# CSS sources
+include content/handlers/css/Makefile
+
+S_CSS := $(addprefix content/handlers/css/,$(S_CSS))
diff --git a/content/handlers/css/Makefile b/content/handlers/css/Makefile
new file mode 100644
index 0000000..bbfc8d7
--- /dev/null
+++ b/content/handlers/css/Makefile
@@ -0,0 +1,4 @@
+# CSS sources
+
+S_CSS := css.c dump.c internal.c hints.c select.c utils.c
+
diff --git a/content/handlers/css/css.c b/content/handlers/css/css.c
new file mode 100644
index 0000000..4c0cb7a
--- /dev/null
+++ b/content/handlers/css/css.c
@@ -0,0 +1,834 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+#include <assert.h>
+#include <libwapcaplet/libwapcaplet.h>
+#include <dom/dom.h>
+
+#include "content/content_protected.h"
+#include "content/fetch.h"
+#include "content/hlcache.h"
+#include "desktop/system_colour.h"
+#include "utils/corestrings.h"
+#include "utils/utils.h"
+#include "utils/http.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+
+#include "css.h"
+#include "hints.h"
+#include "internal.h"
+
+/* Define to trace import fetches */
+#undef NSCSS_IMPORT_TRACE
+
+struct content_css_data;
+
+/**
+ * Type of callback called when a CSS object has finished
+ *
+ * \param css CSS object that has completed
+ * \param pw Client-specific data
+ */
+typedef void (*nscss_done_callback)(struct content_css_data *css, void *pw);
+
+/**
+ * CSS content data
+ */
+struct content_css_data
+{
+ css_stylesheet *sheet; /**< Stylesheet object */
+ char *charset; /**< Character set of stylesheet */
+ struct nscss_import *imports; /**< Array of imported sheets */
+ uint32_t import_count; /**< Number of sheets imported */
+ uint32_t next_to_register; /**< Index of next import to register */
+ nscss_done_callback done; /**< Completion callback */
+ void *pw; /**< Client data */
+};
+
+/**
+ * CSS content data
+ */
+typedef struct nscss_content
+{
+ struct content base; /**< Underlying content object */
+
+ struct content_css_data data; /**< CSS data */
+} nscss_content;
+
+/**
+ * Context for import fetches
+ */
+typedef struct {
+ struct content_css_data *css; /**< Object containing import */
+ uint32_t index; /**< Index into parent sheet's
+ * imports array */
+} nscss_import_ctx;
+
+static bool nscss_process_data(struct content *c, const char *data,
+ unsigned int size);
+static bool nscss_convert(struct content *c);
+static void nscss_destroy(struct content *c);
+static nserror nscss_clone(const struct content *old, struct content **newc);
+static bool nscss_matches_quirks(const struct content *c, bool quirks);
+static content_type nscss_content_type(void);
+
+static nserror nscss_create_css_data(struct content_css_data *c,
+ const char *url, const char *charset, bool quirks,
+ nscss_done_callback done, void *pw);
+static css_error nscss_process_css_data(struct content_css_data *c, const char *data,
+ unsigned int size);
+static css_error nscss_convert_css_data(struct content_css_data *c);
+static void nscss_destroy_css_data(struct content_css_data *c);
+
+static void nscss_content_done(struct content_css_data *css, void *pw);
+static css_error nscss_handle_import(void *pw, css_stylesheet *parent,
+ lwc_string *url, uint64_t media);
+static nserror nscss_import(hlcache_handle *handle,
+ const hlcache_event *event, void *pw);
+static css_error nscss_import_complete(nscss_import_ctx *ctx);
+
+static css_error nscss_register_imports(struct content_css_data *c);
+static css_error nscss_register_import(struct content_css_data *c,
+ const hlcache_handle *import);
+
+
+static css_stylesheet *blank_import;
+
+
+/**
+ * Initialise a CSS content
+ *
+ * \param handler content handler
+ * \param imime_type mime-type
+ * \param params Content-Type parameters
+ * \param llcache handle to content
+ * \param fallback_charset The character set to fallback to.
+ * \param quirks allow quirks
+ * \param c Content to initialise
+ * \return NSERROR_OK or error cod eon faliure
+ */
+static nserror
+nscss_create(const content_handler *handler,
+ lwc_string *imime_type,
+ const http_parameter *params,
+ llcache_handle *llcache,
+ const char *fallback_charset,
+ bool quirks,
+ struct content **c)
+{
+ nscss_content *result;
+ const char *charset = NULL;
+ const char *xnsbase = NULL;
+ lwc_string *charset_value = NULL;
+ union content_msg_data msg_data;
+ nserror error;
+
+ result = calloc(1, sizeof(nscss_content));
+ if (result == NULL)
+ return NSERROR_NOMEM;
+
+ error = content__init(&result->base, handler, imime_type,
+ params, llcache, fallback_charset, quirks);
+ if (error != NSERROR_OK) {
+ free(result);
+ return error;
+ }
+
+ /* Find charset specified on HTTP layer, if any */
+ error = http_parameter_list_find_item(params, corestring_lwc_charset,
+ &charset_value);
+ if (error != NSERROR_OK || lwc_string_length(charset_value) == 0) {
+ /* No charset specified, use fallback, if any */
+ /** \todo libcss will take this as gospel, which is wrong */
+ charset = fallback_charset;
+ } else {
+ charset = lwc_string_data(charset_value);
+ }
+
+ /* Compute base URL for stylesheet */
+ xnsbase = llcache_handle_get_header(llcache, "X-NS-Base");
+ if (xnsbase == NULL) {
+ xnsbase = nsurl_access(content_get_url(&result->base));
+ }
+
+ error = nscss_create_css_data(&result->data,
+ xnsbase, charset, result->base.quirks,
+ nscss_content_done, result);
+ if (error != NSERROR_OK) {
+ msg_data.error = messages_get("NoMemory");
+ content_broadcast(&result->base, CONTENT_MSG_ERROR, msg_data);
+ if (charset_value != NULL)
+ lwc_string_unref(charset_value);
+ free(result);
+ return error;
+ }
+
+ if (charset_value != NULL)
+ lwc_string_unref(charset_value);
+
+ *c = (struct content *) result;
+
+ return NSERROR_OK;
+}
+
+/**
+ * Create a struct content_css_data, creating a stylesheet object
+ *
+ * \param c Struct to populate
+ * \param url URL of stylesheet
+ * \param charset Stylesheet charset
+ * \param quirks Stylesheet quirks mode
+ * \param done Callback to call when content has completed
+ * \param pw Client data for \a done
+ * \return NSERROR_OK on success, NSERROR_NOMEM on memory exhaustion
+ */
+static nserror nscss_create_css_data(struct content_css_data *c,
+ const char *url, const char *charset, bool quirks,
+ nscss_done_callback done, void *pw)
+{
+ css_error error;
+ css_stylesheet_params params;
+
+ c->pw = pw;
+ c->done = done;
+ c->next_to_register = (uint32_t) -1;
+ c->import_count = 0;
+ c->imports = NULL;
+ if (charset != NULL)
+ c->charset = strdup(charset);
+ else
+ c->charset = NULL;
+
+ params.params_version = CSS_STYLESHEET_PARAMS_VERSION_1;
+ params.level = CSS_LEVEL_DEFAULT;
+ params.charset = charset;
+ params.url = url;
+ params.title = NULL;
+ params.allow_quirks = quirks;
+ params.inline_style = false;
+ params.resolve = nscss_resolve_url;
+ params.resolve_pw = NULL;
+ params.import = nscss_handle_import;
+ params.import_pw = c;
+ params.color = ns_system_colour;
+ params.color_pw = NULL;
+ params.font = NULL;
+ params.font_pw = NULL;
+
+ error = css_stylesheet_create(¶ms, &c->sheet);
+ if (error != CSS_OK) {
+ return NSERROR_NOMEM;
+ }
+
+ return NSERROR_OK;
+}
+
+/**
+ * Process CSS source data
+ *
+ * \param c Content structure
+ * \param data Data to process
+ * \param size Number of bytes to process
+ * \return true on success, false on failure
+ */
+bool nscss_process_data(struct content *c, const char *data, unsigned int size)
+{
+ nscss_content *css = (nscss_content *) c;
+ union content_msg_data msg_data;
+ css_error error;
+
+ error = nscss_process_css_data(&css->data, data, size);
+ if (error != CSS_OK && error != CSS_NEEDDATA) {
+ msg_data.error = "?";
+ content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
+ }
+
+ return (error == CSS_OK || error == CSS_NEEDDATA);
+}
+
+/**
+ * Process CSS data
+ *
+ * \param c CSS content object
+ * \param data Data to process
+ * \param size Number of bytes to process
+ * \return CSS_OK on success, appropriate error otherwise
+ */
+static css_error nscss_process_css_data(struct content_css_data *c,
+ const char *data, unsigned int size)
+{
+ return css_stylesheet_append_data(c->sheet,
+ (const uint8_t *) data, size);
+}
+
+/**
+ * Convert a CSS content ready for use
+ *
+ * \param c Content to convert
+ * \return true on success, false on failure
+ */
+bool nscss_convert(struct content *c)
+{
+ nscss_content *css = (nscss_content *) c;
+ union content_msg_data msg_data;
+ css_error error;
+
+ error = nscss_convert_css_data(&css->data);
+ if (error != CSS_OK) {
+ msg_data.error = "?";
+ content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
+ return false;
+ }
+
+ return true;
+}
+
+/**
+ * Convert CSS data ready for use
+ *
+ * \param c CSS data to convert
+ * \return CSS error
+ */
+static css_error nscss_convert_css_data(struct content_css_data *c)
+{
+ css_error error;
+
+ error = css_stylesheet_data_done(c->sheet);
+
+ /* Process pending imports */
+ if (error == CSS_IMPORTS_PENDING) {
+ /* We must not have registered any imports yet */
+ assert(c->next_to_register == (uint32_t) -1);
+
+ /* Start registering, until we find one that
+ * hasn't finished fetching */
+ c->next_to_register = 0;
+ error = nscss_register_imports(c);
+ } else if (error == CSS_OK) {
+ /* No imports, and no errors, so complete conversion */
+ c->done(c, c->pw);
+ } else {
+ const char *url;
+
+ if (css_stylesheet_get_url(c->sheet, &url) == CSS_OK) {
+ LOG("Failed converting %p %s (%d)", c, url, error);
+ } else {
+ LOG("Failed converting %p (%d)", c, error);
+ }
+ }
+
+ return error;
+}
+
+/**
+ * Clean up a CSS content
+ *
+ * \param c Content to clean up
+ */
+void nscss_destroy(struct content *c)
+{
+ nscss_content *css = (nscss_content *) c;
+
+ nscss_destroy_css_data(&css->data);
+}
+
+/**
+ * Clean up CSS data
+ *
+ * \param c CSS data to clean up
+ */
+static void nscss_destroy_css_data(struct content_css_data *c)
+{
+ uint32_t i;
+
+ for (i = 0; i < c->import_count; i++) {
+ if (c->imports[i].c != NULL) {
+ hlcache_handle_release(c->imports[i].c);
+ }
+ c->imports[i].c = NULL;
+ }
+
+ free(c->imports);
+
+ if (c->sheet != NULL) {
+ css_stylesheet_destroy(c->sheet);
+ c->sheet = NULL;
+ }
+
+ free(c->charset);
+}
+
+nserror nscss_clone(const struct content *old, struct content **newc)
+{
+ const nscss_content *old_css = (const nscss_content *) old;
+ nscss_content *new_css;
+ const char *data;
+ unsigned long size;
+ nserror error;
+
+ new_css = calloc(1, sizeof(nscss_content));
+ if (new_css == NULL)
+ return NSERROR_NOMEM;
+
+ /* Clone content */
+ error = content__clone(old, &new_css->base);
+ if (error != NSERROR_OK) {
+ content_destroy(&new_css->base);
+ return error;
+ }
+
+ /* Simply replay create/process/convert */
+ error = nscss_create_css_data(&new_css->data,
+ nsurl_access(content_get_url(&new_css->base)),
+ old_css->data.charset,
+ new_css->base.quirks,
+ nscss_content_done, new_css);
+ if (error != NSERROR_OK) {
+ content_destroy(&new_css->base);
+ return error;
+ }
+
+ data = content__get_source_data(&new_css->base, &size);
+ if (size > 0) {
+ if (nscss_process_data(&new_css->base, data, size) == false) {
+ content_destroy(&new_css->base);
+ return NSERROR_CLONE_FAILED;
+ }
+ }
+
+ if (old->status == CONTENT_STATUS_READY ||
+ old->status == CONTENT_STATUS_DONE) {
+ if (nscss_convert(&new_css->base) == false) {
+ content_destroy(&new_css->base);
+ return NSERROR_CLONE_FAILED;
+ }
+ }
+
+ *newc = (struct content *) new_css;
+
+ return NSERROR_OK;
+}
+
+bool nscss_matches_quirks(const struct content *c, bool quirks)
+{
+ return c->quirks == quirks;
+}
+
+/* exported interface documented in netsurf/css.h */
+css_stylesheet *nscss_get_stylesheet(struct hlcache_handle *h)
+{
+ nscss_content *c = (nscss_content *) hlcache_handle_get_content(h);
+
+ assert(c != NULL);
+
+ return c->data.sheet;
+}
+
+/* exported interface documented in netsurf/css.h */
+struct nscss_import *nscss_get_imports(hlcache_handle *h, uint32_t *n)
+{
+ nscss_content *c = (nscss_content *) hlcache_handle_get_content(h);
+
+ assert(c != NULL);
+ assert(n != NULL);
+
+ *n = c->data.import_count;
+
+ return c->data.imports;
+}
+
+/**
+ * Compute the type of a content
+ *
+ * \return CONTENT_CSS
+ */
+content_type nscss_content_type(void)
+{
+ return CONTENT_CSS;
+}
+
+/*****************************************************************************
+ * Object completion *
+ *****************************************************************************/
+
+/**
+ * Handle notification that a CSS object is done
+ *
+ * \param css CSS object
+ * \param pw Private data
+ */
+void nscss_content_done(struct content_css_data *css, void *pw)
+{
+ union content_msg_data msg_data;
+ struct content *c = pw;
+ uint32_t i;
+ size_t size;
+ css_error error;
+
+ /* Retrieve the size of this sheet */
+ error = css_stylesheet_size(css->sheet, &size);
+ if (error != CSS_OK) {
+ msg_data.error = "?";
+ content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
+ content_set_error(c);
+ return;
+ }
+ c->size += size;
+
+ /* Add on the size of the imported sheets */
+ for (i = 0; i < css->import_count; i++) {
+ if (css->imports[i].c != NULL) {
+ struct content *import = hlcache_handle_get_content(
+ css->imports[i].c);
+
+ if (import != NULL) {
+ c->size += import->size;
+ }
+ }
+ }
+
+ /* Finally, catch the content's users up with reality */
+ content_set_ready(c);
+ content_set_done(c);
+}
+
+/*****************************************************************************
+ * Import handling *
+ *****************************************************************************/
+
+/**
+ * Handle notification of the need for an imported stylesheet
+ *
+ * \param pw CSS object requesting the import
+ * \param parent Stylesheet requesting the import
+ * \param url URL of the imported sheet
+ * \param media Applicable media for the imported sheet
+ * \return CSS_OK on success, appropriate error otherwise
+ */
+css_error nscss_handle_import(void *pw, css_stylesheet *parent,
+ lwc_string *url, uint64_t media)
+{
+ content_type accept = CONTENT_CSS;
+ struct content_css_data *c = pw;
+ nscss_import_ctx *ctx;
+ hlcache_child_context child;
+ struct nscss_import *imports;
+ const char *referer;
+ css_error error;
+ nserror nerror;
+
+ nsurl *ns_url;
+ nsurl *ns_ref;
+
+ assert(parent == c->sheet);
+
+ error = css_stylesheet_get_url(c->sheet, &referer);
+ if (error != CSS_OK) {
+ return error;
+ }
+
+ ctx = malloc(sizeof(*ctx));
+ if (ctx == NULL)
+ return CSS_NOMEM;
+
+ ctx->css = c;
+ ctx->index = c->import_count;
+
+ /* Increase space in table */
+ imports = realloc(c->imports, (c->import_count + 1) *
+ sizeof(struct nscss_import));
+ if (imports == NULL) {
+ free(ctx);
+ return CSS_NOMEM;
+ }
+ c->imports = imports;
+
+ /** \todo fallback charset */
+ child.charset = NULL;
+ error = css_stylesheet_quirks_allowed(c->sheet, &child.quirks);
+ if (error != CSS_OK) {
+ free(ctx);
+ return error;
+ }
+
+ /* Create content */
+ c->imports[c->import_count].media = media;
+
+ /** \todo Why aren't we getting a relative url part, to join? */
+ nerror = nsurl_create(lwc_string_data(url), &ns_url);
+ if (nerror != NSERROR_OK) {
+ free(ctx);
+ return CSS_NOMEM;
+ }
+
+ /** \todo Constructing nsurl for referer here is silly, avoid */
+ nerror = nsurl_create(referer, &ns_ref);
+ if (nerror != NSERROR_OK) {
+ nsurl_unref(ns_url);
+ free(ctx);
+ return CSS_NOMEM;
+ }
+
+ /* Avoid importing ourself */
+ if (nsurl_compare(ns_url, ns_ref, NSURL_COMPLETE)) {
+ c->imports[c->import_count].c = NULL;
+ /* No longer require context as we're not fetching anything */
+ free(ctx);
+ ctx = NULL;
+ } else {
+ nerror = hlcache_handle_retrieve(ns_url,
+ 0, ns_ref, NULL, nscss_import, ctx,
+ &child, accept,
+ &c->imports[c->import_count].c);
+ if (nerror != NSERROR_OK) {
+ free(ctx);
+ return CSS_NOMEM;
+ }
+ }
+
+ nsurl_unref(ns_url);
+ nsurl_unref(ns_ref);
+
+#ifdef NSCSS_IMPORT_TRACE
+ LOG("Import %d '%s' -> (handle: %p ctx: %p)", c->import_count, lwc_string_data(url), c->imports[c->import_count].c, ctx);
+#endif
+
+ c->import_count++;
+
+ return CSS_OK;
+}
+
+/**
+ * Handler for imported stylesheet events
+ *
+ * \param handle Handle for stylesheet
+ * \param event Event object
+ * \param pw Callback context
+ * \return NSERROR_OK on success, appropriate error otherwise
+ */
+nserror nscss_import(hlcache_handle *handle,
+ const hlcache_event *event, void *pw)
+{
+ nscss_import_ctx *ctx = pw;
+ css_error error = CSS_OK;
+
+#ifdef NSCSS_IMPORT_TRACE
+ LOG("Event %d for %p (%p)", event->type, handle, ctx);
+#endif
+
+ assert(ctx->css->imports[ctx->index].c == handle);
+
+ switch (event->type) {
+ case CONTENT_MSG_DONE:
+ error = nscss_import_complete(ctx);
+ break;
+
+ case CONTENT_MSG_ERROR:
+ hlcache_handle_release(handle);
+ ctx->css->imports[ctx->index].c = NULL;
+
+ error = nscss_import_complete(ctx);
+ /* Already released handle */
+ break;
+
+ default:
+ break;
+ }
+
+ /* Preserve out-of-memory. Anything else is OK */
+ return error == CSS_NOMEM ? NSERROR_NOMEM : NSERROR_OK;
+}
+
+/**
+ * Handle an imported stylesheet completing
+ *
+ * \param ctx Import context
+ * \return CSS_OK on success, appropriate error otherwise
+ */
+css_error nscss_import_complete(nscss_import_ctx *ctx)
+{
+ css_error error = CSS_OK;
+
+ /* If this import is the next to be registered, do so */
+ if (ctx->css->next_to_register == ctx->index)
+ error = nscss_register_imports(ctx->css);
+
+#ifdef NSCSS_IMPORT_TRACE
+ LOG("Destroying import context %p for %d", ctx, ctx->index);
+#endif
+
+ /* No longer need import context */
+ free(ctx);
+
+ return error;
+}
+
+/*****************************************************************************
+ * Import registration *
+ *****************************************************************************/
+
+/**
+ * Register imports with a stylesheet
+ *
+ * \param c CSS object containing the imports
+ * \return CSS_OK on success, appropriate error otherwise
+ */
+css_error nscss_register_imports(struct content_css_data *c)
+{
+ uint32_t index;
+ css_error error;
+
+ assert(c->next_to_register != (uint32_t) -1);
+ assert(c->next_to_register < c->import_count);
+
+ /* Register imported sheets */
+ for (index = c->next_to_register; index < c->import_count; index++) {
+ /* Stop registering if we encounter one whose fetch hasn't
+ * completed yet. We'll resume at this point when it has
+ * completed.
+ */
+ if (c->imports[index].c != NULL &&
+ content_get_status(c->imports[index].c) !=
+ CONTENT_STATUS_DONE) {
+ break;
+ }
+
+ error = nscss_register_import(c, c->imports[index].c);
+ if (error != CSS_OK)
+ return error;
+ }
+
+ /* Record identity of the next import to register */
+ c->next_to_register = (uint32_t) index;
+
+ if (c->next_to_register == c->import_count) {
+ /* No more imports: notify parent that we're DONE */
+ c->done(c, c->pw);
+ }
+
+ return CSS_OK;
+}
+
+
+/**
+ * Register an import with a stylesheet
+ *
+ * \param c CSS object that requested the import
+ * \param import Cache handle of import, or NULL for blank
+ * \return CSS_OK on success, appropriate error otherwise
+ */
+css_error nscss_register_import(struct content_css_data *c,
+ const hlcache_handle *import)
+{
+ css_stylesheet *sheet;
+ css_error error;
+
+ if (import != NULL) {
+ nscss_content *s =
+ (nscss_content *) hlcache_handle_get_content(import);
+ sheet = s->data.sheet;
+ } else {
+ /* Create a blank sheet if needed. */
+ if (blank_import == NULL) {
+ css_stylesheet_params params;
+
+ params.params_version = CSS_STYLESHEET_PARAMS_VERSION_1;
+ params.level = CSS_LEVEL_DEFAULT;
+ params.charset = NULL;
+ params.url = "";
+ params.title = NULL;
+ params.allow_quirks = false;
+ params.inline_style = false;
+ params.resolve = nscss_resolve_url;
+ params.resolve_pw = NULL;
+ params.import = NULL;
+ params.import_pw = NULL;
+ params.color = ns_system_colour;
+ params.color_pw = NULL;
+ params.font = NULL;
+ params.font_pw = NULL;
+
+ error = css_stylesheet_create(¶ms, &blank_import);
+ if (error != CSS_OK) {
+ return error;
+ }
+
+ error = css_stylesheet_data_done(blank_import);
+ if (error != CSS_OK) {
+ css_stylesheet_destroy(blank_import);
+ return error;
+ }
+ }
+
+ sheet = blank_import;
+ }
+
+ error = css_stylesheet_register_import(c->sheet, sheet);
+ if (error != CSS_OK) {
+ return error;
+ }
+
+ return error;
+}
+
+/**
+ * Clean up after the CSS content handler
+ */
+static void nscss_fini(void)
+{
+ if (blank_import != NULL) {
+ css_stylesheet_destroy(blank_import);
+ blank_import = NULL;
+ }
+ css_hint_fini();
+}
+
+static const content_handler css_content_handler = {
+ .fini = nscss_fini,
+ .create = nscss_create,
+ .process_data = nscss_process_data,
+ .data_complete = nscss_convert,
+ .destroy = nscss_destroy,
+ .clone = nscss_clone,
+ .matches_quirks = nscss_matches_quirks,
+ .type = nscss_content_type,
+ .no_share = false,
+};
+
+/* exported interface documented in netsurf/css.h */
+nserror nscss_init(void)
+{
+ nserror error;
+
+ error = content_factory_register_handler("text/css",
+ &css_content_handler);
+ if (error != NSERROR_OK)
+ goto error;
+
+ error = css_hint_init();
+ if (error != NSERROR_OK)
+ goto error;
+
+ return NSERROR_OK;
+
+error:
+ nscss_fini();
+
+ return error;
+}
diff --git a/content/handlers/css/css.h b/content/handlers/css/css.h
new file mode 100644
index 0000000..4b38829
--- /dev/null
+++ b/content/handlers/css/css.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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 netsurf_css_css_h_
+#define netsurf_css_css_h_
+
+#include <stdint.h>
+
+#include <libcss/libcss.h>
+
+#include "utils/errors.h"
+
+struct hlcache_handle;
+
+/**
+ * Imported stylesheet record
+ */
+struct nscss_import {
+ struct hlcache_handle *c; /**< Content containing sheet */
+ uint64_t media; /**< Media types that sheet applies to */
+};
+
+/**
+ * Initialise the CSS content handler
+ *
+ * \return NSERROR_OK on success or error code on faliure
+ */
+nserror nscss_init(void);
+
+/**
+ * Retrieve the stylesheet object associated with a CSS content
+ *
+ * \param h Stylesheet content
+ * \return Pointer to stylesheet object
+ */
+css_stylesheet *nscss_get_stylesheet(struct hlcache_handle *h);
+
+/**
+ * Retrieve imported stylesheets
+ *
+ * \param h Stylesheet containing imports
+ * \param n Pointer to location to receive number of imports
+ * \return Pointer to array of imported stylesheets
+ */
+struct nscss_import *nscss_get_imports(struct hlcache_handle *h, uint32_t *n);
+
+#endif
diff --git a/content/handlers/css/dump.c b/content/handlers/css/dump.c
new file mode 100644
index 0000000..125b133
--- /dev/null
+++ b/content/handlers/css/dump.c
@@ -0,0 +1,1793 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+#include <stdio.h>
+#include <libcss/libcss.h>
+
+#include "dump.h"
+
+/**
+ * Dump a fixed point value to the stream in a textual form.
+ *
+ * \param stream Stream to write to
+ * \param f Value to write
+ */
+static void dump_css_fixed(FILE *stream, css_fixed f)
+{
+#define NSCSS_ABS(x) (uint32_t)((x) < 0 ? -(x) : (x))
+ uint32_t uintpart = FIXTOINT(NSCSS_ABS(f));
+ /* + 500 to ensure round to nearest (division will truncate) */
+ uint32_t fracpart = ((NSCSS_ABS(f) & 0x3ff) * 1000 + 500) / (1 << 10);
+#undef NSCSS_ABS
+
+ fprintf(stream, "%s%d.%03d", f < 0 ? "-" : "", uintpart, fracpart);
+}
+
+/**
+ * Dump a numeric value to the stream in a textual form.
+ *
+ * \param stream Stream to write to
+ * \param val Value to write
+ */
+static void dump_css_number(FILE *stream, css_fixed val)
+{
+ if (INTTOFIX(FIXTOINT(val)) == val)
+ fprintf(stream, "%d", FIXTOINT(val));
+ else
+ dump_css_fixed(stream, val);
+}
+
+/**
+ * Dump a dimension to the stream in a textual form.
+ *
+ * \param stream Stream to write to
+ * \param val Value to write
+ * \param unit Unit to write
+ */
+static void dump_css_unit(FILE *stream, css_fixed val, css_unit unit)
+{
+ dump_css_number(stream, val);
+
+ switch (unit) {
+ case CSS_UNIT_PX:
+ fprintf(stream, "px");
+ break;
+ case CSS_UNIT_EX:
+ fprintf(stream, "ex");
+ break;
+ case CSS_UNIT_EM:
+ fprintf(stream, "em");
+ break;
+ case CSS_UNIT_IN:
+ fprintf(stream, "in");
+ break;
+ case CSS_UNIT_CM:
+ fprintf(stream, "cm");
+ break;
+ case CSS_UNIT_MM:
+ fprintf(stream, "mm");
+ break;
+ case CSS_UNIT_PT:
+ fprintf(stream, "pt");
+ break;
+ case CSS_UNIT_PC:
+ fprintf(stream, "pc");
+ break;
+ case CSS_UNIT_PCT:
+ fprintf(stream, "%%");
+ break;
+ case CSS_UNIT_DEG:
+ fprintf(stream, "deg");
+ break;
+ case CSS_UNIT_GRAD:
+ fprintf(stream, "grad");
+ break;
+ case CSS_UNIT_RAD:
+ fprintf(stream, "rad");
+ break;
+ case CSS_UNIT_MS:
+ fprintf(stream, "ms");
+ break;
+ case CSS_UNIT_S:
+ fprintf(stream, "s");
+ break;
+ case CSS_UNIT_HZ:
+ fprintf(stream, "Hz");
+ break;
+ case CSS_UNIT_KHZ:
+ fprintf(stream, "kHz");
+ break;
+ }
+}
+
+/* exported interface documented in content/handlers/css/dump.h */
+void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
+{
+ uint8_t val;
+ css_color color = 0;
+ lwc_string *url = NULL;
+ css_fixed len1 = 0, len2 = 0;
+ css_unit unit1 = CSS_UNIT_PX, unit2 = CSS_UNIT_PX;
+ css_computed_clip_rect rect = { 0, 0, 0, 0, CSS_UNIT_PX, CSS_UNIT_PX,
+ CSS_UNIT_PX, CSS_UNIT_PX, true, true,
+ true, true };
+ const css_computed_content_item *content = NULL;
+ const css_computed_counter *counter = NULL;
+ lwc_string **string_list = NULL;
+ int32_t zindex = 0;
+
+ fprintf(stream, "{ ");
+
+ /* background-attachment */
+ val = css_computed_background_attachment(style);
+ switch (val) {
+ case CSS_BACKGROUND_ATTACHMENT_FIXED:
+ fprintf(stream, "background-attachment: fixed ");
+ break;
+ case CSS_BACKGROUND_ATTACHMENT_SCROLL:
+ fprintf(stream, "background-attachment: scroll ");
+ break;
+ default:
+ break;
+ }
+
+ /* background-color */
+ val = css_computed_background_color(style, &color);
+ switch (val) {
+ case CSS_BACKGROUND_COLOR_COLOR:
+ fprintf(stream, "background-color: #%08x ", color);
+ break;
+ default:
+ break;
+ }
+
+ /* background-image */
+ val = css_computed_background_image(style, &url);
+ if (val == CSS_BACKGROUND_IMAGE_IMAGE && url != NULL) {
+ fprintf(stream, "background-image: url('%.*s') ",
+ (int) lwc_string_length(url),
+ lwc_string_data(url));
+ } else if (val == CSS_BACKGROUND_IMAGE_NONE) {
+ fprintf(stream, "background-image: none ");
+ }
+
+ /* background-position */
+ val = css_computed_background_position(style, &len1, &unit1,
+ &len2, &unit2);
+ if (val == CSS_BACKGROUND_POSITION_SET) {
+ fprintf(stream, "background-position: ");
+ dump_css_unit(stream, len1, unit1);
+ fprintf(stream, " ");
+ dump_css_unit(stream, len2, unit2);
+ fprintf(stream, " ");
+ }
+
+ /* background-repeat */
+ val = css_computed_background_repeat(style);
+ switch (val) {
+ case CSS_BACKGROUND_REPEAT_REPEAT_X:
+ fprintf(stream, "background-repeat: repeat-x ");
+ break;
+ case CSS_BACKGROUND_REPEAT_REPEAT_Y:
+ fprintf(stream, "background-repeat: repeat-y ");
+ break;
+ case CSS_BACKGROUND_REPEAT_REPEAT:
+ fprintf(stream, "background-repeat: repeat ");
+ break;
+ case CSS_BACKGROUND_REPEAT_NO_REPEAT:
+ fprintf(stream, "background-repeat: no-repeat ");
+ break;
+ default:
+ break;
+ }
+
+ /* border-collapse */
+ val = css_computed_border_collapse(style);
+ switch (val) {
+ case CSS_BORDER_COLLAPSE_SEPARATE:
+ fprintf(stream, "border-collapse: separate ");
+ break;
+ case CSS_BORDER_COLLAPSE_COLLAPSE:
+ fprintf(stream, "border-collapse: collapse ");
+ break;
+ default:
+
+ break;
+ }
+
+ /* border-spacing */
+ val = css_computed_border_spacing(style, &len1, &unit1, &len2, &unit2);
+ if (val == CSS_BORDER_SPACING_SET) {
+ fprintf(stream, "border-spacing: ");
+ dump_css_unit(stream, len1, unit1);
+ fprintf(stream, " ");
+ dump_css_unit(stream, len2, unit2);
+ fprintf(stream, " ");
+ }
+
+ /* border-top-color */
+ val = css_computed_border_top_color(style, &color);
+ switch (val) {
+ case CSS_BORDER_COLOR_COLOR:
+ fprintf(stream, "border-top-color: #%08x ", color);
+ break;
+ default:
+ break;
+ }
+
+ /* border-right-color */
+ val = css_computed_border_right_color(style, &color);
+ switch (val) {
+ case CSS_BORDER_COLOR_COLOR:
+ fprintf(stream, "border-right-color: #%08x ", color);
+ break;
+ default:
+ break;
+ }
+
+ /* border-bottom-color */
+ val = css_computed_border_bottom_color(style, &color);
+ switch (val) {
+ case CSS_BORDER_COLOR_COLOR:
+ fprintf(stream, "border-bottom-color: #%08x ", color);
+ break;
+ default:
+ break;
+ }
+
+ /* border-left-color */
+ val = css_computed_border_left_color(style, &color);
+ switch (val) {
+ case CSS_BORDER_COLOR_COLOR:
+ fprintf(stream, "border-left-color: #%08x ", color);
+ break;
+ default:
+ break;
+ }
+
+ /* border-top-style */
+ val = css_computed_border_top_style(style);
+ switch (val) {
+ case CSS_BORDER_STYLE_NONE:
+ fprintf(stream, "border-top-style: none ");
+ break;
+ case CSS_BORDER_STYLE_HIDDEN:
+ fprintf(stream, "border-top-style: hidden ");
+ break;
+ case CSS_BORDER_STYLE_DOTTED:
+ fprintf(stream, "border-top-style: dotted ");
+ break;
+ case CSS_BORDER_STYLE_DASHED:
+ fprintf(stream, "border-top-style: dashed ");
+ break;
+ case CSS_BORDER_STYLE_SOLID:
+ fprintf(stream, "border-top-style: solid ");
+ break;
+ case CSS_BORDER_STYLE_DOUBLE:
+ fprintf(stream, "border-top-style: double ");
+ break;
+ case CSS_BORDER_STYLE_GROOVE:
+ fprintf(stream, "border-top-style: groove ");
+ break;
+ case CSS_BORDER_STYLE_RIDGE:
+ fprintf(stream, "border-top-style: ridge ");
+ break;
+ case CSS_BORDER_STYLE_INSET:
+ fprintf(stream, "border-top-style: inset ");
+ break;
+ case CSS_BORDER_STYLE_OUTSET:
+ fprintf(stream, "border-top-style: outset ");
+ break;
+ default:
+ break;
+ }
+
+ /* border-right-style */
+ val = css_computed_border_right_style(style);
+ switch (val) {
+ case CSS_BORDER_STYLE_NONE:
+ fprintf(stream, "border-right-style: none ");
+ break;
+ case CSS_BORDER_STYLE_HIDDEN:
+ fprintf(stream, "border-right-style: hidden ");
+ break;
+ case CSS_BORDER_STYLE_DOTTED:
+ fprintf(stream, "border-right-style: dotted ");
+ break;
+ case CSS_BORDER_STYLE_DASHED:
+ fprintf(stream, "border-right-style: dashed ");
+ break;
+ case CSS_BORDER_STYLE_SOLID:
+ fprintf(stream, "border-right-style: solid ");
+ break;
+ case CSS_BORDER_STYLE_DOUBLE:
+ fprintf(stream, "border-right-style: double ");
+ break;
+ case CSS_BORDER_STYLE_GROOVE:
+ fprintf(stream, "border-right-style: groove ");
+ break;
+ case CSS_BORDER_STYLE_RIDGE:
+ fprintf(stream, "border-right-style: ridge ");
+ break;
+ case CSS_BORDER_STYLE_INSET:
+ fprintf(stream, "border-right-style: inset ");
+ break;
+ case CSS_BORDER_STYLE_OUTSET:
+ fprintf(stream, "border-right-style: outset ");
+ break;
+ default:
+ break;
+ }
+
+ /* border-bottom-style */
+ val = css_computed_border_bottom_style(style);
+ switch (val) {
+ case CSS_BORDER_STYLE_NONE:
+ fprintf(stream, "border-bottom-style: none ");
+ break;
+ case CSS_BORDER_STYLE_HIDDEN:
+ fprintf(stream, "border-bottom-style: hidden ");
+ break;
+ case CSS_BORDER_STYLE_DOTTED:
+ fprintf(stream, "border-bottom-style: dotted ");
+ break;
+ case CSS_BORDER_STYLE_DASHED:
+ fprintf(stream, "border-bottom-style: dashed ");
+ break;
+ case CSS_BORDER_STYLE_SOLID:
+ fprintf(stream, "border-bottom-style: solid ");
+ break;
+ case CSS_BORDER_STYLE_DOUBLE:
+ fprintf(stream, "border-bottom-style: double ");
+ break;
+ case CSS_BORDER_STYLE_GROOVE:
+ fprintf(stream, "border-bottom-style: groove ");
+ break;
+ case CSS_BORDER_STYLE_RIDGE:
+ fprintf(stream, "border-bottom-style: ridge ");
+ break;
+ case CSS_BORDER_STYLE_INSET:
+ fprintf(stream, "border-bottom-style: inset ");
+ break;
+ case CSS_BORDER_STYLE_OUTSET:
+ fprintf(stream, "border-bottom-style: outset ");
+ break;
+ default:
+ break;
+ }
+
+ /* border-left-style */
+ val = css_computed_border_left_style(style);
+ switch (val) {
+ case CSS_BORDER_STYLE_NONE:
+ fprintf(stream, "border-left-style: none ");
+ break;
+ case CSS_BORDER_STYLE_HIDDEN:
+ fprintf(stream, "border-left-style: hidden ");
+ break;
+ case CSS_BORDER_STYLE_DOTTED:
+ fprintf(stream, "border-left-style: dotted ");
+ break;
+ case CSS_BORDER_STYLE_DASHED:
+ fprintf(stream, "border-left-style: dashed ");
+ break;
+ case CSS_BORDER_STYLE_SOLID:
+ fprintf(stream, "border-left-style: solid ");
+ break;
+ case CSS_BORDER_STYLE_DOUBLE:
+ fprintf(stream, "border-left-style: double ");
+ break;
+ case CSS_BORDER_STYLE_GROOVE:
+ fprintf(stream, "border-left-style: groove ");
+ break;
+ case CSS_BORDER_STYLE_RIDGE:
+ fprintf(stream, "border-left-style: ridge ");
+ break;
+ case CSS_BORDER_STYLE_INSET:
+ fprintf(stream, "border-left-style: inset ");
+ break;
+ case CSS_BORDER_STYLE_OUTSET:
+ fprintf(stream, "border-left-style: outset ");
+ break;
+ default:
+ break;
+ }
+
+ /* border-top-width */
+ val = css_computed_border_top_width(style, &len1, &unit1);
+ switch (val) {
+ case CSS_BORDER_WIDTH_THIN:
+ fprintf(stream, "border-top-width: thin ");
+ break;
+ case CSS_BORDER_WIDTH_MEDIUM:
+ fprintf(stream, "border-top-width: medium ");
+ break;
+ case CSS_BORDER_WIDTH_THICK:
+ fprintf(stream, "border-top-width: thick ");
+ break;
+ case CSS_BORDER_WIDTH_WIDTH:
+ fprintf(stream, "border-top-width: ");
+ dump_css_unit(stream, len1, unit1);
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* border-right-width */
+ val = css_computed_border_right_width(style, &len1, &unit1);
+ switch (val) {
+ case CSS_BORDER_WIDTH_THIN:
+ fprintf(stream, "border-right-width: thin ");
+ break;
+ case CSS_BORDER_WIDTH_MEDIUM:
+ fprintf(stream, "border-right-width: medium ");
+ break;
+ case CSS_BORDER_WIDTH_THICK:
+ fprintf(stream, "border-right-width: thick ");
+ break;
+ case CSS_BORDER_WIDTH_WIDTH:
+ fprintf(stream, "border-right-width: ");
+ dump_css_unit(stream, len1, unit1);
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* border-bottom-width */
+ val = css_computed_border_bottom_width(style, &len1, &unit1);
+ switch (val) {
+ case CSS_BORDER_WIDTH_THIN:
+ fprintf(stream, "border-bottom-width: thin ");
+ break;
+ case CSS_BORDER_WIDTH_MEDIUM:
+ fprintf(stream, "border-bottom-width: medium ");
+ break;
+ case CSS_BORDER_WIDTH_THICK:
+ fprintf(stream, "border-bottom-width: thick ");
+ break;
+ case CSS_BORDER_WIDTH_WIDTH:
+ fprintf(stream, "border-bottom-width: ");
+ dump_css_unit(stream, len1, unit1);
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* border-left-width */
+ val = css_computed_border_left_width(style, &len1, &unit1);
+ switch (val) {
+ case CSS_BORDER_WIDTH_THIN:
+ fprintf(stream, "border-left-width: thin ");
+ break;
+ case CSS_BORDER_WIDTH_MEDIUM:
+ fprintf(stream, "border-left-width: medium ");
+ break;
+ case CSS_BORDER_WIDTH_THICK:
+ fprintf(stream, "border-left-width: thick ");
+ break;
+ case CSS_BORDER_WIDTH_WIDTH:
+ fprintf(stream, "border-left-width: ");
+ dump_css_unit(stream, len1, unit1);
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* bottom */
+ val = css_computed_bottom(style, &len1, &unit1);
+ switch (val) {
+ case CSS_BOTTOM_AUTO:
+ fprintf(stream, "bottom: auto ");
+ break;
+ case CSS_BOTTOM_SET:
+ fprintf(stream, "bottom: ");
+ dump_css_unit(stream, len1, unit1);
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* caption-side */
+ val = css_computed_caption_side(style);
+ switch (val) {
+ case CSS_CAPTION_SIDE_TOP:
+ fprintf(stream, "caption_side: top ");
+ break;
+ case CSS_CAPTION_SIDE_BOTTOM:
+ fprintf(stream, "caption_side: bottom ");
+ break;
+ default:
+ break;
+ }
+
+ /* clear */
+ val = css_computed_clear(style);
+ switch (val) {
+ case CSS_CLEAR_NONE:
+ fprintf(stream, "clear: none ");
+ break;
+ case CSS_CLEAR_LEFT:
+ fprintf(stream, "clear: left ");
+ break;
+ case CSS_CLEAR_RIGHT:
+ fprintf(stream, "clear: right ");
+ break;
+ case CSS_CLEAR_BOTH:
+ fprintf(stream, "clear: both ");
+ break;
+ default:
+ break;
+ }
+
+ /* clip */
+ val = css_computed_clip(style, &rect);
+ switch (val) {
+ case CSS_CLIP_AUTO:
+ fprintf(stream, "clip: auto ");
+ break;
+ case CSS_CLIP_RECT:
+ fprintf(stream, "clip: rect( ");
+
+ if (rect.top_auto)
+ fprintf(stream, "auto");
+ else
+ dump_css_unit(stream, rect.top, rect.tunit);
+ fprintf(stream, ", ");
+
+ if (rect.right_auto)
+ fprintf(stream, "auto");
+ else
+ dump_css_unit(stream, rect.right, rect.runit);
+ fprintf(stream, ", ");
+
+ if (rect.bottom_auto)
+ fprintf(stream, "auto");
+ else
+ dump_css_unit(stream, rect.bottom, rect.bunit);
+ fprintf(stream, ", ");
+
+ if (rect.left_auto)
+ fprintf(stream, "auto");
+ else
+ dump_css_unit(stream, rect.left, rect.lunit);
+ fprintf(stream, ") ");
+ break;
+ default:
+ break;
+ }
+
+ /* color */
+ val = css_computed_color(style, &color);
+ if (val == CSS_COLOR_COLOR) {
+ fprintf(stream, "color: #%08x ", color);
+ }
+
+ /* content */
+ val = css_computed_content(style, &content);
+ switch (val) {
+ case CSS_CONTENT_NONE:
+ fprintf(stream, "content: none ");
+ break;
+ case CSS_CONTENT_NORMAL:
+ fprintf(stream, "content: normal ");
+ break;
+ case CSS_CONTENT_SET:
+ fprintf(stream, "content:");
+
+ while (content->type != CSS_COMPUTED_CONTENT_NONE) {
+ fprintf(stream, " ");
+
+ switch (content->type) {
+ case CSS_COMPUTED_CONTENT_STRING:
+ fprintf(stream, "\"%.*s\"",
+ (int) lwc_string_length(
+ content->data.string),
+ lwc_string_data(
+ content->data.string));
+ break;
+ case CSS_COMPUTED_CONTENT_URI:
+ fprintf(stream, "uri(\"%.*s\")",
+ (int) lwc_string_length(
+ content->data.uri),
+ lwc_string_data(
+ content->data.uri));
+ break;
+ case CSS_COMPUTED_CONTENT_COUNTER:
+ fprintf(stream, "counter(%.*s)",
+ (int) lwc_string_length(
+ content->data.counter.name),
+ lwc_string_data(
+ content->data.counter.name));
+ break;
+ case CSS_COMPUTED_CONTENT_COUNTERS:
+ fprintf(stream, "counters(%.*s, \"%.*s\")",
+ (int) lwc_string_length(
+ content->data.counters.name),
+ lwc_string_data(
+ content->data.counters.name),
+ (int) lwc_string_length(
+ content->data.counters.sep),
+ lwc_string_data(
+ content->data.counters.sep));
+ break;
+ case CSS_COMPUTED_CONTENT_ATTR:
+ fprintf(stream, "attr(%.*s)",
+ (int) lwc_string_length(
+ content->data.attr),
+ lwc_string_data(
+ content->data.attr));
+ break;
+ case CSS_COMPUTED_CONTENT_OPEN_QUOTE:
+ fprintf(stream, "open-quote");
+ break;
+ case CSS_COMPUTED_CONTENT_CLOSE_QUOTE:
+ fprintf(stream, "close-quote");
+ break;
+ case CSS_COMPUTED_CONTENT_NO_OPEN_QUOTE:
+ fprintf(stream, "no-open-quote");
+ break;
+ case CSS_COMPUTED_CONTENT_NO_CLOSE_QUOTE:
+ fprintf(stream, "no-close-quote");
+ break;
+ }
+
+ content++;
+ }
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* counter-increment */
+ val = css_computed_counter_increment(style, &counter);
+ if ((val == CSS_COUNTER_INCREMENT_NONE) || (counter == NULL)) {
+ fprintf(stream, "counter-increment: none ");
+ } else {
+ fprintf(stream, "counter-increment:");
+
+ while (counter->name != NULL) {
+ fprintf(stream, " %.*s ",
+ (int) lwc_string_length(counter->name),
+ lwc_string_data(counter->name));
+
+ dump_css_fixed(stream, counter->value);
+
+ counter++;
+ }
+
+ fprintf(stream, " ");
+ }
+
+ /* counter-reset */
+ val = css_computed_counter_reset(style, &counter);
+ if ((val == CSS_COUNTER_RESET_NONE) || (counter == NULL)) {
+ fprintf(stream, "counter-reset: none ");
+ } else {
+ fprintf(stream, "counter-reset:");
+
+ while (counter->name != NULL) {
+ fprintf(stream, " %.*s ",
+ (int) lwc_string_length(counter->name),
+ lwc_string_data(counter->name));
+
+ dump_css_fixed(stream, counter->value);
+
+ counter++;
+ }
+
+ fprintf(stream, " ");
+ }
+
+ /* cursor */
+ val = css_computed_cursor(style, &string_list);
+ fprintf(stream, "cursor:");
+
+ if (string_list != NULL) {
+ while (*string_list != NULL) {
+ fprintf(stream, " url\"%.*s\")",
+ (int) lwc_string_length(*string_list),
+ lwc_string_data(*string_list));
+
+ string_list++;
+ }
+ }
+ switch (val) {
+ case CSS_CURSOR_AUTO:
+ fprintf(stream, " auto ");
+ break;
+ case CSS_CURSOR_CROSSHAIR:
+ fprintf(stream, " crosshair ");
+ break;
+ case CSS_CURSOR_DEFAULT:
+ fprintf(stream, " default ");
+ break;
+ case CSS_CURSOR_POINTER:
+ fprintf(stream, " pointer ");
+ break;
+ case CSS_CURSOR_MOVE:
+ fprintf(stream, " move ");
+ break;
+ case CSS_CURSOR_E_RESIZE:
+ fprintf(stream, " e-resize ");
+ break;
+ case CSS_CURSOR_NE_RESIZE:
+ fprintf(stream, " ne-resize ");
+ break;
+ case CSS_CURSOR_NW_RESIZE:
+ fprintf(stream, " nw-resize ");
+ break;
+ case CSS_CURSOR_N_RESIZE:
+ fprintf(stream, " n-resize ");
+ break;
+ case CSS_CURSOR_SE_RESIZE:
+ fprintf(stream, " se-resize ");
+ break;
+ case CSS_CURSOR_SW_RESIZE:
+ fprintf(stream, " sw-resize ");
+ break;
+ case CSS_CURSOR_S_RESIZE:
+ fprintf(stream, " s-resize ");
+ break;
+ case CSS_CURSOR_W_RESIZE:
+ fprintf(stream, " w-resize ");
+ break;
+ case CSS_CURSOR_TEXT:
+ fprintf(stream, " text ");
+ break;
+ case CSS_CURSOR_WAIT:
+ fprintf(stream, " wait ");
+ break;
+ case CSS_CURSOR_HELP:
+ fprintf(stream, " help ");
+ break;
+ case CSS_CURSOR_PROGRESS:
+ fprintf(stream, " progress ");
+ break;
+ default:
+ break;
+ }
+
+ /* direction */
+ val = css_computed_direction(style);
+ switch (val) {
+ case CSS_DIRECTION_LTR:
+ fprintf(stream, "direction: ltr ");
+ break;
+ case CSS_DIRECTION_RTL:
+ fprintf(stream, "direction: rtl ");
+ break;
+ default:
+ break;
+ }
+
+ /* display */
+ val = css_computed_display_static(style);
+ switch (val) {
+ case CSS_DISPLAY_INLINE:
+ fprintf(stream, "display: inline ");
+ break;
+ case CSS_DISPLAY_BLOCK:
+ fprintf(stream, "display: block ");
+ break;
+ case CSS_DISPLAY_LIST_ITEM:
+ fprintf(stream, "display: list-item ");
+ break;
+ case CSS_DISPLAY_RUN_IN:
+ fprintf(stream, "display: run-in ");
+ break;
+ case CSS_DISPLAY_INLINE_BLOCK:
+ fprintf(stream, "display: inline-block ");
+ break;
+ case CSS_DISPLAY_TABLE:
+ fprintf(stream, "display: table ");
+ break;
+ case CSS_DISPLAY_INLINE_TABLE:
+ fprintf(stream, "display: inline-table ");
+ break;
+ case CSS_DISPLAY_TABLE_ROW_GROUP:
+ fprintf(stream, "display: table-row-group ");
+ break;
+ case CSS_DISPLAY_TABLE_HEADER_GROUP:
+ fprintf(stream, "display: table-header-group ");
+ break;
+ case CSS_DISPLAY_TABLE_FOOTER_GROUP:
+ fprintf(stream, "display: table-footer-group ");
+ break;
+ case CSS_DISPLAY_TABLE_ROW:
+ fprintf(stream, "display: table-row ");
+ break;
+ case CSS_DISPLAY_TABLE_COLUMN_GROUP:
+ fprintf(stream, "display: table-column-group ");
+ break;
+ case CSS_DISPLAY_TABLE_COLUMN:
+ fprintf(stream, "display: table-column ");
+ break;
+ case CSS_DISPLAY_TABLE_CELL:
+ fprintf(stream, "display: table-cell ");
+ break;
+ case CSS_DISPLAY_TABLE_CAPTION:
+ fprintf(stream, "display: table-caption ");
+ break;
+ case CSS_DISPLAY_NONE:
+ fprintf(stream, "display: none ");
+ break;
+ default:
+ break;
+ }
+
+ /* empty-cells */
+ val = css_computed_empty_cells(style);
+ switch (val) {
+ case CSS_EMPTY_CELLS_SHOW:
+ fprintf(stream, "empty-cells: show ");
+ break;
+ case CSS_EMPTY_CELLS_HIDE:
+ fprintf(stream, "empty-cells: hide ");
+ break;
+ default:
+ break;
+ }
+
+ /* float */
+ val = css_computed_float(style);
+ switch (val) {
+ case CSS_FLOAT_LEFT:
+ fprintf(stream, "float: left ");
+ break;
+ case CSS_FLOAT_RIGHT:
+ fprintf(stream, "float: right ");
+ break;
+ case CSS_FLOAT_NONE:
+ fprintf(stream, "float: none ");
+ break;
+ default:
+ break;
+ }
+
+ /* font-family */
+ val = css_computed_font_family(style, &string_list);
+ if (val != CSS_FONT_FAMILY_INHERIT) {
+ fprintf(stream, "font-family:");
+
+ if (string_list != NULL) {
+ while (*string_list != NULL) {
+ fprintf(stream, " \"%.*s\"",
+ (int) lwc_string_length(*string_list),
+ lwc_string_data(*string_list));
+
+ string_list++;
+ }
+ }
+ switch (val) {
+ case CSS_FONT_FAMILY_SERIF:
+ fprintf(stream, " serif ");
+ break;
+ case CSS_FONT_FAMILY_SANS_SERIF:
+ fprintf(stream, " sans-serif ");
+ break;
+ case CSS_FONT_FAMILY_CURSIVE:
+ fprintf(stream, " cursive ");
+ break;
+ case CSS_FONT_FAMILY_FANTASY:
+ fprintf(stream, " fantasy ");
+ break;
+ case CSS_FONT_FAMILY_MONOSPACE:
+ fprintf(stream, " monospace ");
+ break;
+ }
+ }
+
+ /* font-size */
+ val = css_computed_font_size(style, &len1, &unit1);
+ switch (val) {
+ case CSS_FONT_SIZE_XX_SMALL:
+ fprintf(stream, "font-size: xx-small ");
+ break;
+ case CSS_FONT_SIZE_X_SMALL:
+ fprintf(stream, "font-size: x-small ");
+ break;
+ case CSS_FONT_SIZE_SMALL:
+ fprintf(stream, "font-size: small ");
+ break;
+ case CSS_FONT_SIZE_MEDIUM:
+ fprintf(stream, "font-size: medium ");
+ break;
+ case CSS_FONT_SIZE_LARGE:
+ fprintf(stream, "font-size: large ");
+ break;
+ case CSS_FONT_SIZE_X_LARGE:
+ fprintf(stream, "font-size: x-large ");
+ break;
+ case CSS_FONT_SIZE_XX_LARGE:
+ fprintf(stream, "font-size: xx-large ");
+ break;
+ case CSS_FONT_SIZE_LARGER:
+ fprintf(stream, "font-size: larger ");
+ break;
+ case CSS_FONT_SIZE_SMALLER:
+ fprintf(stream, "font-size: smaller ");
+ break;
+ case CSS_FONT_SIZE_DIMENSION:
+ fprintf(stream, "font-size: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* font-style */
+ val = css_computed_font_style(style);
+ switch (val) {
+ case CSS_FONT_STYLE_NORMAL:
+ fprintf(stream, "font-style: normal ");
+ break;
+ case CSS_FONT_STYLE_ITALIC:
+ fprintf(stream, "font-style: italic ");
+ break;
+ case CSS_FONT_STYLE_OBLIQUE:
+ fprintf(stream, "font-style: oblique ");
+ break;
+ default:
+ break;
+ }
+
+ /* font-variant */
+ val = css_computed_font_variant(style);
+ switch (val) {
+ case CSS_FONT_VARIANT_NORMAL:
+ fprintf(stream, "font-variant: normal ");
+ break;
+ case CSS_FONT_VARIANT_SMALL_CAPS:
+ fprintf(stream, "font-variant: small-caps ");
+ break;
+ default:
+ break;
+ }
+
+ /* font-weight */
+ val = css_computed_font_weight(style);
+ switch (val) {
+ case CSS_FONT_WEIGHT_NORMAL:
+ fprintf(stream, "font-weight: normal ");
+ break;
+ case CSS_FONT_WEIGHT_BOLD:
+ fprintf(stream, "font-weight: bold ");
+ break;
+ case CSS_FONT_WEIGHT_BOLDER:
+ fprintf(stream, "font-weight: bolder ");
+ break;
+ case CSS_FONT_WEIGHT_LIGHTER:
+ fprintf(stream, "font-weight: lighter ");
+ break;
+ case CSS_FONT_WEIGHT_100:
+ fprintf(stream, "font-weight: 100 ");
+ break;
+ case CSS_FONT_WEIGHT_200:
+ fprintf(stream, "font-weight: 200 ");
+ break;
+ case CSS_FONT_WEIGHT_300:
+ fprintf(stream, "font-weight: 300 ");
+ break;
+ case CSS_FONT_WEIGHT_400:
+ fprintf(stream, "font-weight: 400 ");
+ break;
+ case CSS_FONT_WEIGHT_500:
+ fprintf(stream, "font-weight: 500 ");
+ break;
+ case CSS_FONT_WEIGHT_600:
+ fprintf(stream, "font-weight: 600 ");
+ break;
+ case CSS_FONT_WEIGHT_700:
+ fprintf(stream, "font-weight: 700 ");
+ break;
+ case CSS_FONT_WEIGHT_800:
+ fprintf(stream, "font-weight: 800 ");
+ break;
+ case CSS_FONT_WEIGHT_900:
+ fprintf(stream, "font-weight: 900 ");
+ break;
+ default:
+ break;
+ }
+
+ /* height */
+ val = css_computed_height(style, &len1, &unit1);
+ switch (val) {
+ case CSS_HEIGHT_AUTO:
+ fprintf(stream, "height: auto ");
+ break;
+ case CSS_HEIGHT_SET:
+ fprintf(stream, "height: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* left */
+ val = css_computed_left(style, &len1, &unit1);
+ switch (val) {
+ case CSS_LEFT_AUTO:
+ fprintf(stream, "left: auto ");
+ break;
+ case CSS_LEFT_SET:
+ fprintf(stream, "left: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* letter-spacing */
+ val = css_computed_letter_spacing(style, &len1, &unit1);
+ switch (val) {
+ case CSS_LETTER_SPACING_NORMAL:
+ fprintf(stream, "letter-spacing: normal ");
+ break;
+ case CSS_LETTER_SPACING_SET:
+ fprintf(stream, "letter-spacing: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* line-height */
+ val = css_computed_line_height(style, &len1, &unit1);
+ switch (val) {
+ case CSS_LINE_HEIGHT_NORMAL:
+ fprintf(stream, "line-height: normal ");
+ break;
+ case CSS_LINE_HEIGHT_NUMBER:
+ fprintf(stream, "line-height: ");
+
+ dump_css_fixed(stream, len1);
+
+ fprintf(stream, " ");
+ break;
+ case CSS_LINE_HEIGHT_DIMENSION:
+ fprintf(stream, "line-height: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* list-style-image */
+ val = css_computed_list_style_image(style, &url);
+ if (url != NULL) {
+ fprintf(stream, "list-style-image: url('%.*s') ",
+ (int) lwc_string_length(url),
+ lwc_string_data(url));
+ } else if (val == CSS_LIST_STYLE_IMAGE_NONE) {
+ fprintf(stream, "list-style-image: none ");
+ }
+
+ /* list-style-position */
+ val = css_computed_list_style_position(style);
+ switch (val) {
+ case CSS_LIST_STYLE_POSITION_INSIDE:
+ fprintf(stream, "list-style-position: inside ");
+ break;
+ case CSS_LIST_STYLE_POSITION_OUTSIDE:
+ fprintf(stream, "list-style-position: outside ");
+ break;
+ default:
+ break;
+ }
+
+ /* list-style-type */
+ val = css_computed_list_style_type(style);
+ switch (val) {
+ case CSS_LIST_STYLE_TYPE_DISC:
+ fprintf(stream, "list-style-type: disc ");
+ break;
+ case CSS_LIST_STYLE_TYPE_CIRCLE:
+ fprintf(stream, "list-style-type: circle ");
+ break;
+ case CSS_LIST_STYLE_TYPE_SQUARE:
+ fprintf(stream, "list-style-type: square ");
+ break;
+ case CSS_LIST_STYLE_TYPE_DECIMAL:
+ fprintf(stream, "list-style-type: decimal ");
+ break;
+ case CSS_LIST_STYLE_TYPE_DECIMAL_LEADING_ZERO:
+ fprintf(stream, "list-style-type: decimal-leading-zero ");
+ break;
+ case CSS_LIST_STYLE_TYPE_LOWER_ROMAN:
+ fprintf(stream, "list-style-type: lower-roman ");
+ break;
+ case CSS_LIST_STYLE_TYPE_UPPER_ROMAN:
+ fprintf(stream, "list-style-type: upper-roman ");
+ break;
+ case CSS_LIST_STYLE_TYPE_LOWER_GREEK:
+ fprintf(stream, "list-style-type: lower-greek ");
+ break;
+ case CSS_LIST_STYLE_TYPE_LOWER_LATIN:
+ fprintf(stream, "list-style-type: lower-latin ");
+ break;
+ case CSS_LIST_STYLE_TYPE_UPPER_LATIN:
+ fprintf(stream, "list-style-type: upper-latin ");
+ break;
+ case CSS_LIST_STYLE_TYPE_ARMENIAN:
+ fprintf(stream, "list-style-type: armenian ");
+ break;
+ case CSS_LIST_STYLE_TYPE_GEORGIAN:
+ fprintf(stream, "list-style-type: georgian ");
+ break;
+ case CSS_LIST_STYLE_TYPE_LOWER_ALPHA:
+ fprintf(stream, "list-style-type: lower-alpha ");
+ break;
+ case CSS_LIST_STYLE_TYPE_UPPER_ALPHA:
+ fprintf(stream, "list-style-type: upper-alpha ");
+ break;
+ case CSS_LIST_STYLE_TYPE_NONE:
+ fprintf(stream, "list-style-type: none ");
+ break;
+ default:
+ break;
+ }
+
+ /* margin-top */
+ val = css_computed_margin_top(style, &len1, &unit1);
+ switch (val) {
+ case CSS_MARGIN_AUTO:
+ fprintf(stream, "margin-top: auto ");
+ break;
+ case CSS_MARGIN_SET:
+ fprintf(stream, "margin-top: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* margin-right */
+ val = css_computed_margin_right(style, &len1, &unit1);
+ switch (val) {
+ case CSS_MARGIN_AUTO:
+ fprintf(stream, "margin-right: auto ");
+ break;
+ case CSS_MARGIN_SET:
+ fprintf(stream, "margin-right: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* margin-bottom */
+ val = css_computed_margin_bottom(style, &len1, &unit1);
+ switch (val) {
+ case CSS_MARGIN_AUTO:
+ fprintf(stream, "margin-bottom: auto ");
+ break;
+ case CSS_MARGIN_SET:
+ fprintf(stream, "margin-bottom: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* margin-left */
+ val = css_computed_margin_left(style, &len1, &unit1);
+ switch (val) {
+ case CSS_MARGIN_AUTO:
+ fprintf(stream, "margin-left: auto ");
+ break;
+ case CSS_MARGIN_SET:
+ fprintf(stream, "margin-left: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* max-height */
+ val = css_computed_max_height(style, &len1, &unit1);
+ switch (val) {
+ case CSS_MAX_HEIGHT_NONE:
+ fprintf(stream, "max-height: none ");
+ break;
+ case CSS_MAX_HEIGHT_SET:
+ fprintf(stream, "max-height: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* max-width */
+ val = css_computed_max_width(style, &len1, &unit1);
+ switch (val) {
+ case CSS_MAX_WIDTH_NONE:
+ fprintf(stream, "max-width: none ");
+ break;
+ case CSS_MAX_WIDTH_SET:
+ fprintf(stream, "max-width: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* min-height */
+ val = css_computed_min_height(style, &len1, &unit1);
+ switch (val) {
+ case CSS_MIN_HEIGHT_SET:
+ fprintf(stream, "min-height: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* min-width */
+ val = css_computed_min_width(style, &len1, &unit1);
+ switch (val) {
+ case CSS_MIN_WIDTH_SET:
+ fprintf(stream, "min-width: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* opacity */
+ val = css_computed_opacity(style, &len1);
+ switch (val) {
+ case CSS_OPACITY_SET:
+ fprintf(stream, "opacity: ");
+
+ dump_css_fixed(stream, len1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* outline-color */
+ val = css_computed_outline_color(style, &color);
+ switch (val) {
+ case CSS_OUTLINE_COLOR_INVERT:
+ fprintf(stream, "outline-color: invert ");
+ break;
+ case CSS_OUTLINE_COLOR_COLOR:
+ fprintf(stream, "outline-color: #%08x ", color);
+ break;
+ default:
+ break;
+ }
+
+ /* outline-style */
+ val = css_computed_outline_style(style);
+ switch (val) {
+ case CSS_OUTLINE_STYLE_NONE:
+ fprintf(stream, "outline-style: none ");
+ break;
+ case CSS_OUTLINE_STYLE_DOTTED:
+ fprintf(stream, "outline-style: dotted ");
+ break;
+ case CSS_OUTLINE_STYLE_DASHED:
+ fprintf(stream, "outline-style: dashed ");
+ break;
+ case CSS_OUTLINE_STYLE_SOLID:
+ fprintf(stream, "outline-style: solid ");
+ break;
+ case CSS_OUTLINE_STYLE_DOUBLE:
+ fprintf(stream, "outline-style: double ");
+ break;
+ case CSS_OUTLINE_STYLE_GROOVE:
+ fprintf(stream, "outline-style: groove ");
+ break;
+ case CSS_OUTLINE_STYLE_RIDGE:
+ fprintf(stream, "outline-style: ridge ");
+ break;
+ case CSS_OUTLINE_STYLE_INSET:
+ fprintf(stream, "outline-style: inset ");
+ break;
+ case CSS_OUTLINE_STYLE_OUTSET:
+ fprintf(stream, "outline-style: outset ");
+ break;
+ default:
+ break;
+ }
+
+ /* outline-width */
+ val = css_computed_outline_width(style, &len1, &unit1);
+ switch (val) {
+ case CSS_OUTLINE_WIDTH_THIN:
+ fprintf(stream, "outline-width: thin ");
+ break;
+ case CSS_OUTLINE_WIDTH_MEDIUM:
+ fprintf(stream, "outline-width: medium ");
+ break;
+ case CSS_OUTLINE_WIDTH_THICK:
+ fprintf(stream, "outline-width: thick ");
+ break;
+ case CSS_OUTLINE_WIDTH_WIDTH:
+ fprintf(stream, "outline-width: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* overflow */
+ val = css_computed_overflow_x(style);
+ switch (val) {
+ case CSS_OVERFLOW_VISIBLE:
+ fprintf(stream, "overflow-x: visible ");
+ break;
+ case CSS_OVERFLOW_HIDDEN:
+ fprintf(stream, "overflow-x: hidden ");
+ break;
+ case CSS_OVERFLOW_SCROLL:
+ fprintf(stream, "overflow-x: scroll ");
+ break;
+ case CSS_OVERFLOW_AUTO:
+ fprintf(stream, "overflow-x auto ");
+ break;
+ default:
+ break;
+ }
+
+ /* overflow */
+ val = css_computed_overflow_y(style);
+ switch (val) {
+ case CSS_OVERFLOW_VISIBLE:
+ fprintf(stream, "overflow-y: visible ");
+ break;
+ case CSS_OVERFLOW_HIDDEN:
+ fprintf(stream, "overflow-y: hidden ");
+ break;
+ case CSS_OVERFLOW_SCROLL:
+ fprintf(stream, "overflow-y: scroll ");
+ break;
+ case CSS_OVERFLOW_AUTO:
+ fprintf(stream, "overflow-y: auto ");
+ break;
+ default:
+ break;
+ }
+
+ /* padding-top */
+ val = css_computed_padding_top(style, &len1, &unit1);
+ switch (val) {
+ case CSS_PADDING_SET:
+ fprintf(stream, "padding-top: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* padding-right */
+ val = css_computed_padding_right(style, &len1, &unit1);
+ switch (val) {
+ case CSS_PADDING_SET:
+ fprintf(stream, "padding-right: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* padding-bottom */
+ val = css_computed_padding_bottom(style, &len1, &unit1);
+ switch (val) {
+ case CSS_PADDING_SET:
+ fprintf(stream, "padding-bottom: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* padding-left */
+ val = css_computed_padding_left(style, &len1, &unit1);
+ switch (val) {
+ case CSS_PADDING_SET:
+ fprintf(stream, "padding-left: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* position */
+ val = css_computed_position(style);
+ switch (val) {
+ case CSS_POSITION_STATIC:
+ fprintf(stream, "position: static ");
+ break;
+ case CSS_POSITION_RELATIVE:
+ fprintf(stream, "position: relative ");
+ break;
+ case CSS_POSITION_ABSOLUTE:
+ fprintf(stream, "position: absolute ");
+ break;
+ case CSS_POSITION_FIXED:
+ fprintf(stream, "position: fixed ");
+ break;
+ default:
+ break;
+ }
+
+ /* quotes */
+ val = css_computed_quotes(style, &string_list);
+ if (val == CSS_QUOTES_STRING && string_list != NULL) {
+ fprintf(stream, "quotes:");
+
+ while (*string_list != NULL) {
+ fprintf(stream, " \"%.*s\"",
+ (int) lwc_string_length(*string_list),
+ lwc_string_data(*string_list));
+
+ string_list++;
+ }
+
+ fprintf(stream, " ");
+ } else {
+ switch (val) {
+ case CSS_QUOTES_NONE:
+ fprintf(stream, "quotes: none ");
+ break;
+ default:
+ break;
+ }
+ }
+
+ /* right */
+ val = css_computed_right(style, &len1, &unit1);
+ switch (val) {
+ case CSS_RIGHT_AUTO:
+ fprintf(stream, "right: auto ");
+ break;
+ case CSS_RIGHT_SET:
+ fprintf(stream, "right: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* table-layout */
+ val = css_computed_table_layout(style);
+ switch (val) {
+ case CSS_TABLE_LAYOUT_AUTO:
+ fprintf(stream, "table-layout: auto ");
+ break;
+ case CSS_TABLE_LAYOUT_FIXED:
+ fprintf(stream, "table-layout: fixed ");
+ break;
+ default:
+ break;
+ }
+
+ /* text-align */
+ val = css_computed_text_align(style);
+ switch (val) {
+ case CSS_TEXT_ALIGN_LEFT:
+ fprintf(stream, "text-align: left ");
+ break;
+ case CSS_TEXT_ALIGN_RIGHT:
+ fprintf(stream, "text-align: right ");
+ break;
+ case CSS_TEXT_ALIGN_CENTER:
+ fprintf(stream, "text-align: center ");
+ break;
+ case CSS_TEXT_ALIGN_JUSTIFY:
+ fprintf(stream, "text-align: justify ");
+ break;
+ case CSS_TEXT_ALIGN_DEFAULT:
+ fprintf(stream, "text-align: default ");
+ break;
+ case CSS_TEXT_ALIGN_LIBCSS_LEFT:
+ fprintf(stream, "text-align: -libcss-left ");
+ break;
+ case CSS_TEXT_ALIGN_LIBCSS_CENTER:
+ fprintf(stream, "text-align: -libcss-center ");
+ break;
+ case CSS_TEXT_ALIGN_LIBCSS_RIGHT:
+ fprintf(stream, "text-align: -libcss-right ");
+ break;
+ default:
+ break;
+ }
+
+ /* text-decoration */
+ val = css_computed_text_decoration(style);
+ if (val == CSS_TEXT_DECORATION_NONE) {
+ fprintf(stream, "text-decoration: none ");
+ } else {
+ fprintf(stream, "text-decoration:");
+
+ if (val & CSS_TEXT_DECORATION_BLINK) {
+ fprintf(stream, " blink");
+ }
+ if (val & CSS_TEXT_DECORATION_LINE_THROUGH) {
+ fprintf(stream, " line-through");
+ }
+ if (val & CSS_TEXT_DECORATION_OVERLINE) {
+ fprintf(stream, " overline");
+ }
+ if (val & CSS_TEXT_DECORATION_UNDERLINE) {
+ fprintf(stream, " underline");
+ }
+
+ fprintf(stream, " ");
+ }
+
+ /* text-indent */
+ val = css_computed_text_indent(style, &len1, &unit1);
+ switch (val) {
+ case CSS_TEXT_INDENT_SET:
+ fprintf(stream, "text-indent: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* text-transform */
+ val = css_computed_text_transform(style);
+ switch (val) {
+ case CSS_TEXT_TRANSFORM_CAPITALIZE:
+ fprintf(stream, "text-transform: capitalize ");
+ break;
+ case CSS_TEXT_TRANSFORM_UPPERCASE:
+ fprintf(stream, "text-transform: uppercase ");
+ break;
+ case CSS_TEXT_TRANSFORM_LOWERCASE:
+ fprintf(stream, "text-transform: lowercase ");
+ break;
+ case CSS_TEXT_TRANSFORM_NONE:
+ fprintf(stream, "text-transform: none ");
+ break;
+ default:
+ break;
+ }
+
+ /* top */
+ val = css_computed_top(style, &len1, &unit1);
+ switch (val) {
+ case CSS_TOP_AUTO:
+ fprintf(stream, "top: auto ");
+ break;
+ case CSS_TOP_SET:
+ fprintf(stream, "top: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* unicode-bidi */
+ val = css_computed_unicode_bidi(style);
+ switch (val) {
+ case CSS_UNICODE_BIDI_NORMAL:
+ fprintf(stream, "unicode-bidi: normal ");
+ break;
+ case CSS_UNICODE_BIDI_EMBED:
+ fprintf(stream, "unicode-bidi: embed ");
+ break;
+ case CSS_UNICODE_BIDI_BIDI_OVERRIDE:
+ fprintf(stream, "unicode-bidi: bidi-override ");
+ break;
+ default:
+ break;
+ }
+
+ /* vertical-align */
+ val = css_computed_vertical_align(style, &len1, &unit1);
+ switch (val) {
+ case CSS_VERTICAL_ALIGN_BASELINE:
+ fprintf(stream, "vertical-align: baseline ");
+ break;
+ case CSS_VERTICAL_ALIGN_SUB:
+ fprintf(stream, "vertical-align: sub ");
+ break;
+ case CSS_VERTICAL_ALIGN_SUPER:
+ fprintf(stream, "vertical-align: super ");
+ break;
+ case CSS_VERTICAL_ALIGN_TOP:
+ fprintf(stream, "vertical-align: top ");
+ break;
+ case CSS_VERTICAL_ALIGN_TEXT_TOP:
+ fprintf(stream, "vertical-align: text-top ");
+ break;
+ case CSS_VERTICAL_ALIGN_MIDDLE:
+ fprintf(stream, "vertical-align: middle ");
+ break;
+ case CSS_VERTICAL_ALIGN_BOTTOM:
+ fprintf(stream, "vertical-align: bottom ");
+ break;
+ case CSS_VERTICAL_ALIGN_TEXT_BOTTOM:
+ fprintf(stream, "vertical-align: text-bottom ");
+ break;
+ case CSS_VERTICAL_ALIGN_SET:
+ fprintf(stream, "vertical-align: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* visibility */
+ val = css_computed_visibility(style);
+ switch (val) {
+ case CSS_VISIBILITY_VISIBLE:
+ fprintf(stream, "visibility: visible ");
+ break;
+ case CSS_VISIBILITY_HIDDEN:
+ fprintf(stream, "visibility: hidden ");
+ break;
+ case CSS_VISIBILITY_COLLAPSE:
+ fprintf(stream, "visibility: collapse ");
+ break;
+ default:
+ break;
+ }
+
+ /* white-space */
+ val = css_computed_white_space(style);
+ switch (val) {
+ case CSS_WHITE_SPACE_NORMAL:
+ fprintf(stream, "white-space: normal ");
+ break;
+ case CSS_WHITE_SPACE_PRE:
+ fprintf(stream, "white-space: pre ");
+ break;
+ case CSS_WHITE_SPACE_NOWRAP:
+ fprintf(stream, "white-space: nowrap ");
+ break;
+ case CSS_WHITE_SPACE_PRE_WRAP:
+ fprintf(stream, "white-space: pre-wrap ");
+ break;
+ case CSS_WHITE_SPACE_PRE_LINE:
+ fprintf(stream, "white-space: pre-line ");
+ break;
+ default:
+ break;
+ }
+
+ /* width */
+ val = css_computed_width(style, &len1, &unit1);
+ switch (val) {
+ case CSS_WIDTH_AUTO:
+ fprintf(stream, "width: auto ");
+ break;
+ case CSS_WIDTH_SET:
+ fprintf(stream, "width: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* word-spacing */
+ val = css_computed_word_spacing(style, &len1, &unit1);
+ switch (val) {
+ case CSS_WORD_SPACING_NORMAL:
+ fprintf(stream, "word-spacing: normal ");
+ break;
+ case CSS_WORD_SPACING_SET:
+ fprintf(stream, "word-spacing: ");
+
+ dump_css_unit(stream, len1, unit1);
+
+ fprintf(stream, " ");
+ break;
+ default:
+ break;
+ }
+
+ /* z-index */
+ val = css_computed_z_index(style, &zindex);
+ switch (val) {
+ case CSS_Z_INDEX_AUTO:
+ fprintf(stream, "z-index: auto ");
+ break;
+ case CSS_Z_INDEX_SET:
+ fprintf(stream, "z-index: %d ", zindex);
+ break;
+ default:
+ break;
+ }
+
+ fprintf(stream, "}");
+}
diff --git a/content/handlers/css/dump.h b/content/handlers/css/dump.h
new file mode 100644
index 0000000..470e564
--- /dev/null
+++ b/content/handlers/css/dump.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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 NETSURF_CSS_DUMP_H_
+#define NETSURF_CSS_DUMP_H_
+
+/**
+ * Dump a computed style \a style to the give file handle \a stream.
+ *
+ * \param stream Stream to write to
+ * \param style Computed style to dump
+ */
+void nscss_dump_computed_style(FILE *stream, const css_computed_style *style);
+
+#endif
diff --git a/content/handlers/css/hints.c b/content/handlers/css/hints.c
new file mode 100644
index 0000000..f394ea8
--- /dev/null
+++ b/content/handlers/css/hints.c
@@ -0,0 +1,1604 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+#include <string.h>
+#include <strings.h>
+
+#include "utils/nsoption.h"
+#include "utils/corestrings.h"
+#include "utils/log.h"
+#include "utils/nsurl.h"
+#include "utils/utils.h"
+
+#include "hints.h"
+#include "select.h"
+
+#define LOG_STATS
+#undef LOG_STATS
+
+/******************************************************************************
+ * Utility functions *
+ ******************************************************************************/
+
+/**
+ * Determine if a given character is whitespace
+ *
+ * \param c Character to consider
+ * \return true if character is whitespace, false otherwise
+ */
+static bool isWhitespace(char c)
+{
+ return c == ' ' || c == '\t' || c == '\f' || c == '\r' || c == '\n';
+}
+
+/**
+ * Determine if a given character is a valid hex digit
+ *
+ * \param c Character to consider
+ * \return true if character is a valid hex digit, false otherwise
+ */
+static bool isHex(char c)
+{
+ return ('0' <= c && c <= '9') ||
+ ('A' <= (c & ~0x20) && (c & ~0x20) <= 'F');
+}
+
+/**
+ * Convert a character representing a hex digit to the corresponding hex value
+ *
+ * \param c Character to convert
+ * \return Hex value represented by character
+ *
+ * \note This function assumes an ASCII-compatible character set
+ */
+static uint8_t charToHex(char c)
+{
+ /* 0-9 */
+ c -= '0';
+
+ /* A-F */
+ if (c > 9)
+ c -= 'A' - '9' - 1;
+
+ /* a-f */
+ if (c > 15)
+ c -= 'a' - 'A';
+
+ return c;
+}
+
+
+/******************************************************************************
+ * Common parsing functions *
+ ******************************************************************************/
+
+/**
+ * Parse a number string
+ *
+ * \param data Data to parse (NUL-terminated)
+ * \param maybe_negative Negative numbers permitted
+ * \param real Floating point numbers permitted
+ * \param value Pointer to location to receive numeric value
+ * \param consumed Pointer to location to receive number of input
+ * bytes consumed
+ * \return true on success, false on invalid input
+ */
+static bool parse_number(const char *data, bool maybe_negative, bool real,
+ css_fixed *value, size_t *consumed)
+{
+ size_t len;
+ const uint8_t *ptr;
+ int32_t intpart = 0;
+ int32_t fracpart = 0;
+ int32_t pwr = 1;
+ int sign = 1;
+
+ *consumed = 0;
+
+ len = strlen(data);
+ ptr = (const uint8_t *) data;
+
+ if (len == 0)
+ return false;
+
+ /* Skip leading whitespace */
+ while (len > 0 && isWhitespace(ptr[0])) {
+ len--;
+ ptr++;
+ }
+
+ if (len == 0)
+ return false;
+
+ /* Extract sign, if any */
+ if (ptr[0] == '+') {
+ len--;
+ ptr++;
+ } else if (ptr[0] == '-' && maybe_negative) {
+ sign = -1;
+ len--;
+ ptr++;
+ }
+
+ if (len == 0)
+ return false;
+
+ /* Must have a digit [0,9] */
+ if ('0' > ptr[0] || ptr[0] > '9')
+ return false;
+
+ /* Now extract intpart, assuming base 10 */
+ while (len > 0) {
+ /* Stop on first non-digit */
+ if (ptr[0] < '0' || '9' < ptr[0])
+ break;
+
+ /* Prevent overflow of 'intpart'; proper clamping below */
+ if (intpart < (1 << 22)) {
+ intpart *= 10;
+ intpart += ptr[0] - '0';
+ }
+ ptr++;
+ len--;
+ }
+
+ /* And fracpart, again, assuming base 10 */
+ if (real && len > 1 && ptr[0] == '.' &&
+ ('0' <= ptr[1] && ptr[1] <= '9')) {
+ ptr++;
+ len--;
+
+ while (len > 0) {
+ if (ptr[0] < '0' || '9' < ptr[0])
+ break;
+
+ if (pwr < 1000000) {
+ pwr *= 10;
+ fracpart *= 10;
+ fracpart += ptr[0] - '0';
+ }
+ ptr++;
+ len--;
+ }
+
+ fracpart = ((1 << 10) * fracpart + pwr/2) / pwr;
+ if (fracpart >= (1 << 10)) {
+ intpart++;
+ fracpart &= (1 << 10) - 1;
+ }
+ }
+
+ if (sign > 0) {
+ /* If the result is larger than we can represent,
+ * then clamp to the maximum value we can store. */
+ if (intpart >= (1 << 21)) {
+ intpart = (1 << 21) - 1;
+ fracpart = (1 << 10) - 1;
+ }
+ } else {
+ /* If the negated result is smaller than we can represent
+ * then clamp to the minimum value we can store. */
+ if (intpart >= (1 << 21)) {
+ intpart = -(1 << 21);
+ fracpart = 0;
+ } else {
+ intpart = -intpart;
+ if (fracpart) {
+ fracpart = (1 << 10) - fracpart;
+ intpart--;
+ }
+ }
+ }
+
+ *value = (intpart << 10) | fracpart;
+
+ *consumed = ptr - (const uint8_t *) data;
+
+ return true;
+}
+
+/**
+ * Parse a dimension string
+ *
+ * \param data Data to parse (NUL-terminated)
+ * \param strict Whether to enforce strict parsing rules
+ * \param length Pointer to location to receive dimension's length
+ * \param unit Pointer to location to receive dimension's unit
+ * \return true on success, false on invalid input
+ */
+static bool parse_dimension(const char *data, bool strict, css_fixed *length,
+ css_unit *unit)
+{
+ size_t len;
+ size_t read;
+ css_fixed value;
+
+ len = strlen(data);
+
+ if (parse_number(data, false, true, &value, &read) == false)
+ return false;
+
+ if (strict && value < INTTOFIX(1))
+ return false;
+
+ *length = value;
+
+ if (len > read && data[read] == '%')
+ *unit = CSS_UNIT_PCT;
+ else
+ *unit = CSS_UNIT_PX;
+
+ return true;
+}
+
+/**
+ * Mapping of colour name to CSS color
+ */
+struct colour_map {
+ const char *name;
+ css_color color;
+};
+
+/**
+ * Name comparator for named colour matching
+ *
+ * \param a Name to match
+ * \param b Colour map entry to consider
+ * \return 0 on match,
+ * < 0 if a < b,
+ * > 0 if b > a.
+ */
+static int cmp_colour_name(const void *a, const void *b)
+{
+ const char *aa = a;
+ const struct colour_map *bb = b;
+
+ return strcasecmp(aa, bb->name);
+}
+
+/**
+ * Parse a named colour
+ *
+ * \param name Name to parse
+ * \param result Pointer to location to receive css_color
+ * \return true on success, false on invalid input
+ */
+static bool parse_named_colour(const char *name, css_color *result)
+{
+ static const struct colour_map named_colours[] = {
+ { "aliceblue", 0xfff0f8ff },
+ { "antiquewhite", 0xfffaebd7 },
+ { "aqua", 0xff00ffff },
+ { "aquamarine", 0xff7fffd4 },
+ { "azure", 0xfff0ffff },
+ { "beige", 0xfff5f5dc },
+ { "bisque", 0xffffe4c4 },
+ { "black", 0xff000000 },
+ { "blanchedalmond", 0xffffebcd },
+ { "blue", 0xff0000ff },
+ { "blueviolet", 0xff8a2be2 },
+ { "brown", 0xffa52a2a },
+ { "burlywood", 0xffdeb887 },
+ { "cadetblue", 0xff5f9ea0 },
+ { "chartreuse", 0xff7fff00 },
+ { "chocolate", 0xffd2691e },
+ { "coral", 0xffff7f50 },
+ { "cornflowerblue", 0xff6495ed },
+ { "cornsilk", 0xfffff8dc },
+ { "crimson", 0xffdc143c },
+ { "cyan", 0xff00ffff },
+ { "darkblue", 0xff00008b },
+ { "darkcyan", 0xff008b8b },
+ { "darkgoldenrod", 0xffb8860b },
+ { "darkgray", 0xffa9a9a9 },
+ { "darkgreen", 0xff006400 },
+ { "darkgrey", 0xffa9a9a9 },
+ { "darkkhaki", 0xffbdb76b },
+ { "darkmagenta", 0xff8b008b },
+ { "darkolivegreen", 0xff556b2f },
+ { "darkorange", 0xffff8c00 },
+ { "darkorchid", 0xff9932cc },
+ { "darkred", 0xff8b0000 },
+ { "darksalmon", 0xffe9967a },
+ { "darkseagreen", 0xff8fbc8f },
+ { "darkslateblue", 0xff483d8b },
+ { "darkslategray", 0xff2f4f4f },
+ { "darkslategrey", 0xff2f4f4f },
+ { "darkturquoise", 0xff00ced1 },
+ { "darkviolet", 0xff9400d3 },
+ { "deeppink", 0xffff1493 },
+ { "deepskyblue", 0xff00bfff },
+ { "dimgray", 0xff696969 },
+ { "dimgrey", 0xff696969 },
+ { "dodgerblue", 0xff1e90ff },
+ { "feldspar", 0xffd19275 },
+ { "firebrick", 0xffb22222 },
+ { "floralwhite", 0xfffffaf0 },
+ { "forestgreen", 0xff228b22 },
+ { "fuchsia", 0xffff00ff },
+ { "gainsboro", 0xffdcdcdc },
+ { "ghostwhite", 0xfff8f8ff },
+ { "gold", 0xffffd700 },
+ { "goldenrod", 0xffdaa520 },
+ { "gray", 0xff808080 },
+ { "green", 0xff008000 },
+ { "greenyellow", 0xffadff2f },
+ { "grey", 0xff808080 },
+ { "honeydew", 0xfff0fff0 },
+ { "hotpink", 0xffff69b4 },
+ { "indianred", 0xffcd5c5c },
+ { "indigo", 0xff4b0082 },
+ { "ivory", 0xfffffff0 },
+ { "khaki", 0xfff0e68c },
+ { "lavender", 0xffe6e6fa },
+ { "lavenderblush", 0xfffff0f5 },
+ { "lawngreen", 0xff7cfc00 },
+ { "lemonchiffon", 0xfffffacd },
+ { "lightblue", 0xffadd8e6 },
+ { "lightcoral", 0xfff08080 },
+ { "lightcyan", 0xffe0ffff },
+ { "lightgoldenrodyellow", 0xfffafad2 },
+ { "lightgray", 0xffd3d3d3 },
+ { "lightgreen", 0xff90ee90 },
+ { "lightgrey", 0xffd3d3d3 },
+ { "lightpink", 0xffffb6c1 },
+ { "lightsalmon", 0xffffa07a },
+ { "lightseagreen", 0xff20b2aa },
+ { "lightskyblue", 0xff87cefa },
+ { "lightslateblue", 0xff8470ff },
+ { "lightslategray", 0xff778899 },
+ { "lightslategrey", 0xff778899 },
+ { "lightsteelblue", 0xffb0c4de },
+ { "lightyellow", 0xffffffe0 },
+ { "lime", 0xff00ff00 },
+ { "limegreen", 0xff32cd32 },
+ { "linen", 0xfffaf0e6 },
+ { "magenta", 0xffff00ff },
+ { "maroon", 0xff800000 },
+ { "mediumaquamarine", 0xff66cdaa },
+ { "mediumblue", 0xff0000cd },
+ { "mediumorchid", 0xffba55d3 },
+ { "mediumpurple", 0xff9370db },
+ { "mediumseagreen", 0xff3cb371 },
+ { "mediumslateblue", 0xff7b68ee },
+ { "mediumspringgreen", 0xff00fa9a },
+ { "mediumturquoise", 0xff48d1cc },
+ { "mediumvioletred", 0xffc71585 },
+ { "midnightblue", 0xff191970 },
+ { "mintcream", 0xfff5fffa },
+ { "mistyrose", 0xffffe4e1 },
+ { "moccasin", 0xffffe4b5 },
+ { "navajowhite", 0xffffdead },
+ { "navy", 0xff000080 },
+ { "oldlace", 0xfffdf5e6 },
+ { "olive", 0xff808000 },
+ { "olivedrab", 0xff6b8e23 },
+ { "orange", 0xffffa500 },
+ { "orangered", 0xffff4500 },
+ { "orchid", 0xffda70d6 },
+ { "palegoldenrod", 0xffeee8aa },
+ { "palegreen", 0xff98fb98 },
+ { "paleturquoise", 0xffafeeee },
+ { "palevioletred", 0xffdb7093 },
+ { "papayawhip", 0xffffefd5 },
+ { "peachpuff", 0xffffdab9 },
+ { "peru", 0xffcd853f },
+ { "pink", 0xffffc0cb },
+ { "plum", 0xffdda0dd },
+ { "powderblue", 0xffb0e0e6 },
+ { "purple", 0xff800080 },
+ { "red", 0xffff0000 },
+ { "rosybrown", 0xffbc8f8f },
+ { "royalblue", 0xff4169e1 },
+ { "saddlebrown", 0xff8b4513 },
+ { "salmon", 0xfffa8072 },
+ { "sandybrown", 0xfff4a460 },
+ { "seagreen", 0xff2e8b57 },
+ { "seashell", 0xfffff5ee },
+ { "sienna", 0xffa0522d },
+ { "silver", 0xffc0c0c0 },
+ { "skyblue", 0xff87ceeb },
+ { "slateblue", 0xff6a5acd },
+ { "slategray", 0xff708090 },
+ { "slategrey", 0xff708090 },
+ { "snow", 0xfffffafa },
+ { "springgreen", 0xff00ff7f },
+ { "steelblue", 0xff4682b4 },
+ { "tan", 0xffd2b48c },
+ { "teal", 0xff008080 },
+ { "thistle", 0xffd8bfd8 },
+ { "tomato", 0xffff6347 },
+ { "turquoise", 0xff40e0d0 },
+ { "violet", 0xffee82ee },
+ { "violetred", 0xffd02090 },
+ { "wheat", 0xfff5deb3 },
+ { "white", 0xffffffff },
+ { "whitesmoke", 0xfff5f5f5 },
+ { "yellow", 0xffffff00 },
+ { "yellowgreen", 0xff9acd32 }
+ };
+ const struct colour_map *entry;
+
+ entry = bsearch(name, named_colours,
+ sizeof(named_colours) / sizeof(named_colours[0]),
+ sizeof(named_colours[0]),
+ cmp_colour_name);
+
+ if (entry != NULL)
+ *result = entry->color;
+
+ return entry != NULL;
+}
+
+/* exported interface documented in content/handlers/css/hints.h */
+bool nscss_parse_colour(const char *data, css_color *result)
+{
+ size_t len = strlen(data);
+ uint8_t r, g, b;
+
+ /* 2 */
+ if (len == 0)
+ return false;
+
+ /* 3 */
+ if (len == SLEN("transparent") && strcasecmp(data, "transparent") == 0)
+ return false;
+
+ /* 4 */
+ if (parse_named_colour(data, result))
+ return true;
+
+ /** \todo Implement HTML5's utterly insane legacy colour parsing */
+
+ if (data[0] == '#') {
+ data++;
+ len--;
+ }
+
+ if (len == 3 && isHex(data[0]) && isHex(data[1]) && isHex(data[2])) {
+ r = charToHex(data[0]);
+ g = charToHex(data[1]);
+ b = charToHex(data[2]);
+
+ r |= (r << 4);
+ g |= (g << 4);
+ b |= (b << 4);
+
+ *result = (0xff << 24) | (r << 16) | (g << 8) | b;
+
+ return true;
+ } else if (len == 6 && isHex(data[0]) && isHex(data[1]) &&
+ isHex(data[2]) && isHex(data[3]) && isHex(data[4]) &&
+ isHex(data[5])) {
+ r = (charToHex(data[0]) << 4) | charToHex(data[1]);
+ g = (charToHex(data[2]) << 4) | charToHex(data[3]);
+ b = (charToHex(data[4]) << 4) | charToHex(data[5]);
+
+ *result = (0xff << 24) | (r << 16) | (g << 8) | b;
+
+ return true;
+ }
+
+ return false;
+}
+
+/**
+ * Parse a font \@size attribute
+ *
+ * \param size Data to parse (NUL-terminated)
+ * \param val Pointer to location to receive enum value
+ * \param len Pointer to location to receive length
+ * \param unit Pointer to location to receive unit
+ * \return True on success, false on failure
+ */
+static bool parse_font_size(const char *size, uint8_t *val,
+ css_fixed *len, css_unit *unit)
+{
+ static const uint8_t size_map[] = {
+ CSS_FONT_SIZE_XX_SMALL,
+ CSS_FONT_SIZE_SMALL,
+ CSS_FONT_SIZE_MEDIUM,
+ CSS_FONT_SIZE_LARGE,
+ CSS_FONT_SIZE_X_LARGE,
+ CSS_FONT_SIZE_XX_LARGE,
+ CSS_FONT_SIZE_DIMENSION /* xxx-large (see below) */
+ };
+
+ const char *p = size;
+ char mode;
+ int value = 0;
+
+ /* Skip whitespace */
+ while (*p != '\0' && isWhitespace(*p))
+ p++;
+
+ mode = *p;
+
+ /* Skip +/- */
+ if (mode == '+' || mode == '-')
+ p++;
+
+ /* Need at least one digit */
+ if (*p < '0' || *p > '9') {
+ return false;
+ }
+
+ /* Consume digits, computing value */
+ while ('0' <= *p && *p <= '9') {
+ value = value * 10 + (*p - '0');
+ p++;
+ }
+
+ /* Resolve relative sizes */
+ if (mode == '+')
+ value += 3;
+ else if (mode == '-')
+ value = 3 - value;
+
+ /* Clamp to range [1,7] */
+ if (value < 1)
+ value = 1;
+ else if (value > 7)
+ value = 7;
+
+ if (value == 7) {
+ /* Manufacture xxx-large */
+ *len = FDIV(FMUL(INTTOFIX(3), INTTOFIX(nsoption_int(font_size))),
+ F_10);
+ } else {
+ /* Len is irrelevant */
+ *len = 0;
+ }
+
+ *unit = CSS_UNIT_PT;
+ *val = size_map[value - 1];
+
+ return true;
+}
+
+
+/******************************************************************************
+ * Hint context management *
+ ******************************************************************************/
+
+#define MAX_HINTS_PER_ELEMENT 32
+
+struct css_hint_ctx {
+ struct css_hint *hints;
+ uint32_t len;
+};
+
+struct css_hint_ctx hint_ctx;
+
+nserror css_hint_init(void)
+{
+ hint_ctx.hints = malloc(sizeof(struct css_hint) *
+ MAX_HINTS_PER_ELEMENT);
+ if (hint_ctx.hints == NULL) {
+ return NSERROR_NOMEM;
+ }
+
+ return NSERROR_OK;
+}
+
+void css_hint_fini(void)
+{
+ hint_ctx.len = 0;
+ free(hint_ctx.hints);
+}
+
+static void css_hint_clean(void)
+{
+ hint_ctx.len = 0;
+}
+
+static inline struct css_hint * css_hint_advance(struct css_hint *hint)
+{
+ hint_ctx.len++;
+ assert(hint_ctx.len < MAX_HINTS_PER_ELEMENT);
+
+ return ++hint;
+}
+
+static void css_hint_get_hints(struct css_hint **hints, uint32_t *nhints)
+{
+ *hints = hint_ctx.hints;
+ *nhints = hint_ctx.len;
+}
+
+
+/******************************************************************************
+ * Presentational hint handlers *
+ ******************************************************************************/
+
+static void css_hint_table_cell_border_padding(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ css_qname qs;
+ dom_string *attr = NULL;
+ dom_node *tablenode = NULL;
+ dom_exception exc;
+
+ qs.ns = NULL;
+ qs.name = lwc_string_ref(corestring_lwc_table);
+ if (named_ancestor_node(ctx, node, &qs,
+ (void *)&tablenode) != CSS_OK) {
+ /* Didn't find, or had error */
+ lwc_string_unref(qs.name);
+ return;
+ }
+ lwc_string_unref(qs.name);
+
+ if (tablenode == NULL) {
+ return;
+ }
+ /* No need to unref tablenode, named_ancestor_node does not
+ * return a reffed node to the CSS
+ */
+
+ exc = dom_element_get_attribute(tablenode,
+ corestring_dom_border, &attr);
+
+ if (exc == DOM_NO_ERR && attr != NULL) {
+ uint32_t hint_prop;
+ css_hint_length hint_length;
+
+ if (parse_dimension(
+ dom_string_data(attr), false,
+ &hint_length.value,
+ &hint_length.unit) &&
+ INTTOFIX(0) != hint_length.value) {
+
+ for (hint_prop = CSS_PROP_BORDER_TOP_STYLE;
+ hint_prop <= CSS_PROP_BORDER_LEFT_STYLE;
+ hint_prop++) {
+ hint->prop = hint_prop;
+ hint->status = CSS_BORDER_STYLE_INSET;
+ hint = css_hint_advance(hint);
+ }
+
+ for (hint_prop = CSS_PROP_BORDER_TOP_WIDTH;
+ hint_prop <= CSS_PROP_BORDER_LEFT_WIDTH;
+ hint_prop++) {
+ hint->prop = hint_prop;
+ hint->data.length.value = INTTOFIX(1);
+ hint->data.length.unit = CSS_UNIT_PX;
+ hint->status = CSS_BORDER_WIDTH_WIDTH;
+ hint = css_hint_advance(hint);
+ }
+ }
+ dom_string_unref(attr);
+ }
+
+ exc = dom_element_get_attribute(tablenode,
+ corestring_dom_bordercolor, &attr);
+
+ if (exc == DOM_NO_ERR && attr != NULL) {
+ uint32_t hint_prop;
+ css_color hint_color;
+
+ if (nscss_parse_colour(
+ (const char *)dom_string_data(attr),
+ &hint_color)) {
+
+ for (hint_prop = CSS_PROP_BORDER_TOP_COLOR;
+ hint_prop <= CSS_PROP_BORDER_LEFT_COLOR;
+ hint_prop++) {
+ hint->prop = hint_prop;
+ hint->data.color = hint_color;
+ hint->status = CSS_BORDER_COLOR_COLOR;
+ hint = css_hint_advance(hint);
+ }
+ }
+ dom_string_unref(attr);
+ }
+
+ exc = dom_element_get_attribute(tablenode,
+ corestring_dom_cellpadding, &attr);
+
+ if (exc == DOM_NO_ERR && attr != NULL) {
+ uint32_t hint_prop;
+ css_hint_length hint_length;
+
+ if (parse_dimension(
+ dom_string_data(attr), false,
+ &hint_length.value,
+ &hint_length.unit)) {
+
+ for (hint_prop = CSS_PROP_PADDING_TOP;
+ hint_prop <= CSS_PROP_PADDING_LEFT;
+ hint_prop++) {
+ hint->prop = hint_prop;
+ hint->data.length.value = hint_length.value;
+ hint->data.length.unit = hint_length.unit;
+ hint->status = CSS_PADDING_SET;
+ hint = css_hint_advance(hint);
+ }
+ }
+ dom_string_unref(attr);
+ }
+}
+
+static void css_hint_vertical_align_table_cells(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_string *attr = NULL;
+ dom_exception err;
+
+ err = dom_element_get_attribute(node,
+ corestring_dom_valign, &attr);
+
+ if (err == DOM_NO_ERR && attr != NULL) {
+ if (dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_top)) {
+ hint->prop = CSS_PROP_VERTICAL_ALIGN;
+ hint->status = CSS_VERTICAL_ALIGN_TOP;
+ hint = css_hint_advance(hint);
+
+ } else if (dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_middle)) {
+ hint->prop = CSS_PROP_VERTICAL_ALIGN;
+ hint->status = CSS_VERTICAL_ALIGN_MIDDLE;
+ hint = css_hint_advance(hint);
+
+ } else if (dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_bottom)) {
+ hint->prop = CSS_PROP_VERTICAL_ALIGN;
+ hint->status = CSS_VERTICAL_ALIGN_BOTTOM;
+ hint = css_hint_advance(hint);
+
+ } else if (dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_baseline)) {
+ hint->prop = CSS_PROP_VERTICAL_ALIGN;
+ hint->status = CSS_VERTICAL_ALIGN_BASELINE;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(attr);
+ }
+}
+
+static void css_hint_vertical_align_replaced(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_string *attr = NULL;
+ dom_exception err;
+
+ err = dom_element_get_attribute(node,
+ corestring_dom_valign, &attr);
+
+ if (err == DOM_NO_ERR && attr != NULL) {
+ if (dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_top)) {
+ hint->prop = CSS_PROP_VERTICAL_ALIGN;
+ hint->status = CSS_VERTICAL_ALIGN_TOP;
+ hint = css_hint_advance(hint);
+
+ } else if (dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_bottom) ||
+ dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_baseline)) {
+ hint->prop = CSS_PROP_VERTICAL_ALIGN;
+ hint->status = CSS_VERTICAL_ALIGN_BASELINE;
+ hint = css_hint_advance(hint);
+
+ } else if (dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_texttop)) {
+ hint->prop = CSS_PROP_VERTICAL_ALIGN;
+ hint->status = CSS_VERTICAL_ALIGN_TEXT_TOP;
+ hint = css_hint_advance(hint);
+
+ } else if (dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_absmiddle) ||
+ dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_abscenter)) {
+ hint->prop = CSS_PROP_VERTICAL_ALIGN;
+ hint->status = CSS_VERTICAL_ALIGN_MIDDLE;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(attr);
+ }
+}
+
+static void css_hint_text_align_normal(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_string *align = NULL;
+ dom_exception err;
+
+ err = dom_element_get_attribute(node,
+ corestring_dom_align, &align);
+ if (err == DOM_NO_ERR && align != NULL) {
+ if (dom_string_caseless_lwc_isequal(align,
+ corestring_lwc_left)) {
+ hint->prop = CSS_PROP_TEXT_ALIGN;
+ hint->status = CSS_TEXT_ALIGN_LEFT;
+ hint = css_hint_advance(hint);
+
+ } else if (dom_string_caseless_lwc_isequal(align,
+ corestring_lwc_center)) {
+ hint->prop = CSS_PROP_TEXT_ALIGN;
+ hint->status = CSS_TEXT_ALIGN_CENTER;
+ hint = css_hint_advance(hint);
+
+ } else if (dom_string_caseless_lwc_isequal(align,
+ corestring_lwc_right)) {
+ hint->prop = CSS_PROP_TEXT_ALIGN;
+ hint->status = CSS_TEXT_ALIGN_RIGHT;
+ hint = css_hint_advance(hint);
+
+ } else if (dom_string_caseless_lwc_isequal(align,
+ corestring_lwc_justify)) {
+ hint->prop = CSS_PROP_TEXT_ALIGN;
+ hint->status = CSS_TEXT_ALIGN_JUSTIFY;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(align);
+ }
+}
+
+static void css_hint_text_align_center(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+
+ hint->prop = CSS_PROP_TEXT_ALIGN;
+ hint->status = CSS_TEXT_ALIGN_LIBCSS_CENTER;
+ hint = css_hint_advance(hint);
+}
+
+static void css_hint_margin_left_right_align_center(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_string *attr;
+ dom_exception exc;
+
+ exc = dom_element_get_attribute(node,
+ corestring_dom_align, &attr);
+
+ if (exc == DOM_NO_ERR && attr != NULL) {
+ if (dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_center) ||
+ dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_abscenter) ||
+ dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_middle) ||
+ dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_absmiddle)) {
+ hint->prop = CSS_PROP_MARGIN_LEFT;
+ hint->status = CSS_MARGIN_AUTO;
+ hint = css_hint_advance(hint);
+
+ hint->prop = CSS_PROP_MARGIN_RIGHT;
+ hint->status = CSS_MARGIN_AUTO;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(attr);
+ }
+}
+
+static void css_hint_text_align_special(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_string *align = NULL;
+ dom_exception err;
+
+ err = dom_element_get_attribute(node,
+ corestring_dom_align, &align);
+
+ if (err == DOM_NO_ERR && align != NULL) {
+ if (dom_string_caseless_lwc_isequal(align,
+ corestring_lwc_center)) {
+ hint->prop = CSS_PROP_TEXT_ALIGN;
+ hint->status = CSS_TEXT_ALIGN_LIBCSS_CENTER;
+ hint = css_hint_advance(hint);
+
+ } else if (dom_string_caseless_lwc_isequal(align,
+ corestring_lwc_left)) {
+ hint->prop = CSS_PROP_TEXT_ALIGN;
+ hint->status = CSS_TEXT_ALIGN_LIBCSS_LEFT;
+ hint = css_hint_advance(hint);
+
+ } else if (dom_string_caseless_lwc_isequal(align,
+ corestring_lwc_right)) {
+ hint->prop = CSS_PROP_TEXT_ALIGN;
+ hint->status = CSS_TEXT_ALIGN_LIBCSS_RIGHT;
+ hint = css_hint_advance(hint);
+
+ } else if (dom_string_caseless_lwc_isequal(align,
+ corestring_lwc_justify)) {
+ hint->prop = CSS_PROP_TEXT_ALIGN;
+ hint->status = CSS_TEXT_ALIGN_JUSTIFY;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(align);
+ }
+}
+
+static void css_hint_text_align_table_special(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+
+ hint->prop = CSS_PROP_TEXT_ALIGN;
+ hint->status = CSS_TEXT_ALIGN_INHERIT_IF_NON_MAGIC;
+ hint = css_hint_advance(hint);
+}
+
+static void css_hint_margin_hspace_vspace(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_string *attr = NULL;
+ dom_exception exc;
+
+ exc = dom_element_get_attribute(node,
+ corestring_dom_vspace, &attr);
+
+ if (exc == DOM_NO_ERR && attr != NULL) {
+ css_hint_length hint_length;
+ if (parse_dimension(
+ dom_string_data(attr), false,
+ &hint_length.value,
+ &hint_length.unit)) {
+ hint->prop = CSS_PROP_MARGIN_TOP;
+ hint->data.length.value = hint_length.value;
+ hint->data.length.unit = hint_length.unit;
+ hint->status = CSS_MARGIN_SET;
+ hint = css_hint_advance(hint);
+
+ hint->prop = CSS_PROP_MARGIN_BOTTOM;
+ hint->data.length.value = hint_length.value;
+ hint->data.length.unit = hint_length.unit;
+ hint->status = CSS_MARGIN_SET;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(attr);
+ }
+
+ exc = dom_element_get_attribute(node,
+ corestring_dom_hspace, &attr);
+
+ if (exc == DOM_NO_ERR && attr != NULL) {
+ css_hint_length hint_length;
+ if (parse_dimension(
+ dom_string_data(attr), false,
+ &hint_length.value,
+ &hint_length.unit)) {
+ hint->prop = CSS_PROP_MARGIN_LEFT;
+ hint->data.length.value = hint_length.value;
+ hint->data.length.unit = hint_length.unit;
+ hint->status = CSS_MARGIN_SET;
+ hint = css_hint_advance(hint);
+
+ hint->prop = CSS_PROP_MARGIN_RIGHT;
+ hint->data.length.value = hint_length.value;
+ hint->data.length.unit = hint_length.unit;
+ hint->status = CSS_MARGIN_SET;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(attr);
+ }
+}
+
+static void css_hint_margin_left_right_hr(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_string *attr;
+ dom_exception exc;
+
+ exc = dom_element_get_attribute(node,
+ corestring_dom_align, &attr);
+
+ if (exc == DOM_NO_ERR && attr != NULL) {
+ if (dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_left)) {
+ hint->prop = CSS_PROP_MARGIN_LEFT;
+ hint->data.length.value = 0;
+ hint->data.length.unit = CSS_UNIT_PX;
+ hint->status = CSS_MARGIN_SET;
+ hint = css_hint_advance(hint);
+
+ hint->prop = CSS_PROP_MARGIN_RIGHT;
+ hint->status = CSS_MARGIN_AUTO;
+ hint = css_hint_advance(hint);
+
+ } else if (dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_center)) {
+ hint->prop = CSS_PROP_MARGIN_LEFT;
+ hint->status = CSS_MARGIN_AUTO;
+ hint = css_hint_advance(hint);
+
+ hint->prop = CSS_PROP_MARGIN_RIGHT;
+ hint->status = CSS_MARGIN_AUTO;
+ hint = css_hint_advance(hint);
+
+ } else if (dom_string_caseless_lwc_isequal(attr,
+ corestring_lwc_right)) {
+ hint->prop = CSS_PROP_MARGIN_LEFT;
+ hint->status = CSS_MARGIN_AUTO;
+ hint = css_hint_advance(hint);
+
+ hint->prop = CSS_PROP_MARGIN_RIGHT;
+ hint->data.length.value = 0;
+ hint->data.length.unit = CSS_UNIT_PX;
+ hint->status = CSS_MARGIN_SET;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(attr);
+ }
+}
+
+static void css_hint_table_spacing_border(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_exception exc;
+ dom_string *attr = NULL;
+
+ exc = dom_element_get_attribute(node, corestring_dom_border, &attr);
+
+ if (exc == DOM_NO_ERR && attr != NULL) {
+ uint32_t hint_prop;
+ css_hint_length hint_length;
+
+ for (hint_prop = CSS_PROP_BORDER_TOP_STYLE;
+ hint_prop <= CSS_PROP_BORDER_LEFT_STYLE;
+ hint_prop++) {
+ hint->prop = hint_prop;
+ hint->status = CSS_BORDER_STYLE_OUTSET;
+ hint = css_hint_advance(hint);
+ }
+
+ if (parse_dimension(
+ dom_string_data(attr), false,
+ &hint_length.value,
+ &hint_length.unit)) {
+
+ for (hint_prop = CSS_PROP_BORDER_TOP_WIDTH;
+ hint_prop <= CSS_PROP_BORDER_LEFT_WIDTH;
+ hint_prop++) {
+ hint->prop = hint_prop;
+ hint->data.length.value = hint_length.value;
+ hint->data.length.unit = hint_length.unit;
+ hint->status = CSS_BORDER_WIDTH_WIDTH;
+ hint = css_hint_advance(hint);
+ }
+ }
+ dom_string_unref(attr);
+ }
+
+ exc = dom_element_get_attribute(node,
+ corestring_dom_bordercolor, &attr);
+
+ if (exc == DOM_NO_ERR && attr != NULL) {
+ uint32_t hint_prop;
+ css_color hint_color;
+
+ if (nscss_parse_colour(
+ (const char *)dom_string_data(attr),
+ &hint_color)) {
+
+ for (hint_prop = CSS_PROP_BORDER_TOP_COLOR;
+ hint_prop <= CSS_PROP_BORDER_LEFT_COLOR;
+ hint_prop++) {
+ hint->prop = hint_prop;
+ hint->data.color = hint_color;
+ hint->status = CSS_BORDER_COLOR_COLOR;
+ hint = css_hint_advance(hint);
+ }
+ }
+ dom_string_unref(attr);
+ }
+
+ exc = dom_element_get_attribute(node,
+ corestring_dom_cellspacing, &attr);
+
+ if (exc == DOM_NO_ERR && attr != NULL) {
+ if (parse_dimension(
+ (const char *)dom_string_data(attr), false,
+ &hint->data.position.h.value,
+ &hint->data.position.h.unit)) {
+ hint->prop = CSS_PROP_BORDER_SPACING;
+ hint->data.position.v = hint->data.position.h;
+ hint->status = CSS_BORDER_SPACING_SET;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(attr);
+ }
+}
+
+static void css_hint_height(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_string *attr = NULL;
+ dom_exception err;
+
+ err = dom_element_get_attribute(node,
+ corestring_dom_height, &attr);
+
+ if (err == DOM_NO_ERR && attr != NULL) {
+ if (parse_dimension(
+ (const char *)dom_string_data(attr), false,
+ &hint->data.length.value,
+ &hint->data.length.unit)) {
+ hint->prop = CSS_PROP_HEIGHT;
+ hint->status = CSS_HEIGHT_SET;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(attr);
+ }
+}
+
+static void css_hint_width(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_string *attr = NULL;
+ dom_exception err;
+
+ err = dom_element_get_attribute(node,
+ corestring_dom_width, &attr);
+
+ if (err == DOM_NO_ERR && attr != NULL) {
+ if (parse_dimension(
+ (const char *)dom_string_data(attr), false,
+ &hint->data.length.value,
+ &hint->data.length.unit)) {
+ hint->prop = CSS_PROP_WIDTH;
+ hint->status = CSS_WIDTH_SET;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(attr);
+ }
+}
+
+static void css_hint_height_width_textarea(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_string *attr = NULL;
+ dom_exception err;
+
+ err = dom_element_get_attribute(node,
+ corestring_dom_rows, &attr);
+
+ if (err == DOM_NO_ERR && attr != NULL) {
+ if (parse_dimension(
+ (const char *)dom_string_data(attr), false,
+ &hint->data.length.value,
+ &hint->data.length.unit)) {
+ hint->prop = CSS_PROP_HEIGHT;
+ hint->data.length.unit = CSS_UNIT_EM;
+ hint->status = CSS_HEIGHT_SET;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(attr);
+ }
+
+ err = dom_element_get_attribute(node,
+ corestring_dom_cols, &attr);
+
+ if (err == DOM_NO_ERR && attr != NULL) {
+ if (parse_dimension(
+ (const char *)dom_string_data(attr), false,
+ &hint->data.length.value,
+ &hint->data.length.unit)) {
+ hint->prop = CSS_PROP_WIDTH;
+ hint->data.length.unit = CSS_UNIT_EX;
+ hint->status = CSS_WIDTH_SET;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(attr);
+ }
+}
+
+static void css_hint_width_input(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &(hint_ctx.hints[hint_ctx.len]);
+ dom_string *attr = NULL;
+ dom_exception err;
+
+ err = dom_element_get_attribute(node,
+ corestring_dom_size, &attr);
+
+ if (err == DOM_NO_ERR && attr != NULL) {
+ if (parse_dimension(
+ (const char *)dom_string_data(attr), false,
+ &hint->data.length.value,
+ &hint->data.length.unit)) {
+ dom_string *attr2 = NULL;
+
+ err = dom_element_get_attribute(node,
+ corestring_dom_type, &attr2);
+ if (err == DOM_NO_ERR) {
+
+ hint->prop = CSS_PROP_WIDTH;
+ hint->status = CSS_WIDTH_SET;
+
+ if (attr2 == NULL ||
+ dom_string_caseless_lwc_isequal(
+ attr2,
+ corestring_lwc_text) ||
+ dom_string_caseless_lwc_isequal(
+ attr2,
+ corestring_lwc_search) ||
+ dom_string_caseless_lwc_isequal(
+ attr2,
+ corestring_lwc_password) ||
+ dom_string_caseless_lwc_isequal(
+ attr2,
+ corestring_lwc_file)) {
+ hint->data.length.unit = CSS_UNIT_EX;
+ }
+ if (attr2 != NULL) {
+ dom_string_unref(attr2);
+ }
+ hint = css_hint_advance(hint);
+ }
+ }
+ dom_string_unref(attr);
+ }
+}
+
+static void css_hint_anchor_color(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ css_error error;
+ dom_exception err;
+ dom_string *color;
+ dom_node *bodynode = NULL;
+
+ /* find body node */
+ css_qname qs;
+ bool is_visited;
+
+ qs.ns = NULL;
+ qs.name = lwc_string_ref(corestring_lwc_body);
+ if (named_ancestor_node(ctx, node, &qs,
+ (void *)&bodynode) != CSS_OK) {
+ /* Didn't find, or had error */
+ lwc_string_unref(qs.name);
+ return ;
+ }
+ lwc_string_unref(qs.name);
+
+ if (bodynode == NULL) {
+ return;
+ }
+
+ error = node_is_visited(ctx, node, &is_visited);
+ if (error != CSS_OK)
+ return;
+
+ if (is_visited) {
+ err = dom_element_get_attribute(bodynode,
+ corestring_dom_vlink, &color);
+ } else {
+ err = dom_element_get_attribute(bodynode,
+ corestring_dom_link, &color);
+ }
+
+ if (err == DOM_NO_ERR && color != NULL) {
+ if (nscss_parse_colour(
+ (const char *)dom_string_data(color),
+ &hint->data.color)) {
+ hint->prop = CSS_PROP_COLOR;
+ hint->status = CSS_COLOR_COLOR;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(color);
+ }
+}
+
+static void css_hint_body_color(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_exception err;
+ dom_string *color;
+
+ err = dom_element_get_attribute(node, corestring_dom_text, &color);
+
+ if (err == DOM_NO_ERR && color != NULL) {
+ if (nscss_parse_colour(
+ (const char *)dom_string_data(color),
+ &hint->data.color)) {
+ hint->prop = CSS_PROP_COLOR;
+ hint->status = CSS_COLOR_COLOR;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(color);
+ }
+}
+
+static void css_hint_color(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_exception err;
+ dom_string *color;
+
+ err = dom_element_get_attribute(node, corestring_dom_color, &color);
+
+ if (err == DOM_NO_ERR && color != NULL) {
+ if (nscss_parse_colour(
+ (const char *)dom_string_data(color),
+ &hint->data.color)) {
+ hint->prop = CSS_PROP_COLOR;
+ hint->status = CSS_COLOR_COLOR;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(color);
+ }
+}
+
+static void css_hint_font_size(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_exception err;
+ dom_string *size;
+
+ err = dom_element_get_attribute(node, corestring_dom_size, &size);
+ if (err == DOM_NO_ERR && size != NULL) {
+ if (parse_font_size(
+ (const char *)dom_string_data(size),
+ &hint->status,
+ &hint->data.length.value,
+ &hint->data.length.unit)) {
+ hint->prop = CSS_PROP_FONT_SIZE;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(size);
+ }
+}
+
+static void css_hint_float(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_exception err;
+ dom_string *align;
+
+ err = dom_element_get_attribute(node, corestring_dom_align, &align);
+ if (err == DOM_NO_ERR && align != NULL) {
+ if (dom_string_caseless_lwc_isequal(align,
+ corestring_lwc_left)) {
+ hint->prop = CSS_PROP_FLOAT;
+ hint->status = CSS_FLOAT_LEFT;
+ hint = css_hint_advance(hint);
+
+ } else if (dom_string_caseless_lwc_isequal(align,
+ corestring_lwc_right)) {
+ hint->prop = CSS_PROP_FLOAT;
+ hint->status = CSS_FLOAT_RIGHT;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(align);
+ }
+}
+
+static void css_hint_caption_side(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_exception err;
+ dom_string *align = NULL;
+
+ err = dom_element_get_attribute(node, corestring_dom_align, &align);
+ if (err == DOM_NO_ERR && align != NULL) {
+ if (dom_string_caseless_lwc_isequal(align,
+ corestring_lwc_bottom)) {
+ hint->prop = CSS_PROP_CAPTION_SIDE;
+ hint->status = CSS_CAPTION_SIDE_BOTTOM;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(align);
+ }
+}
+
+static void css_hint_bg_color(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+ dom_exception err;
+ dom_string *bgcolor;
+
+ err = dom_element_get_attribute(node,
+ corestring_dom_bgcolor, &bgcolor);
+ if (err == DOM_NO_ERR && bgcolor != NULL) {
+ if (nscss_parse_colour(
+ (const char *)dom_string_data(bgcolor),
+ &hint->data.color)) {
+ hint->prop = CSS_PROP_BACKGROUND_COLOR;
+ hint->status = CSS_BACKGROUND_COLOR_COLOR;
+ hint = css_hint_advance(hint);
+ }
+ dom_string_unref(bgcolor);
+ }
+}
+
+static void css_hint_bg_image(
+ nscss_select_ctx *ctx,
+ dom_node *node)
+{
+ struct css_hint *hint = &(hint_ctx.hints[hint_ctx.len]);
+ dom_exception err;
+ dom_string *attr;
+
+ err = dom_element_get_attribute(node,
+ corestring_dom_background, &attr);
+ if (err == DOM_NO_ERR && attr != NULL) {
+ nsurl *url;
+ nserror error = nsurl_join(ctx->base_url,
+ (const char *)dom_string_data(attr), &url);
+ dom_string_unref(attr);
+
+ if (error == NSERROR_OK) {
+ lwc_string *iurl;
+ lwc_error lerror = lwc_intern_string(nsurl_access(url),
+ nsurl_length(url), &iurl);
+ nsurl_unref(url);
+
+ if (lerror == lwc_error_ok) {
+ hint->prop = CSS_PROP_BACKGROUND_IMAGE;
+ hint->data.string = iurl;
+ hint->status = CSS_BACKGROUND_IMAGE_IMAGE;
+ hint = css_hint_advance(hint);
+ }
+ }
+ }
+}
+
+
+/* Exported function, documeted in css/hints.h */
+css_error node_presentational_hint(void *pw, void *node,
+ uint32_t *nhints, css_hint **hints)
+{
+ dom_exception exc;
+ dom_html_element_type tag_type;
+
+ css_hint_clean();
+
+ exc = dom_html_element_get_tag_type(node, &tag_type);
+ if (exc != DOM_NO_ERR) {
+ tag_type = DOM_HTML_ELEMENT_TYPE__UNKNOWN;
+ }
+
+ switch (tag_type) {
+ case DOM_HTML_ELEMENT_TYPE_TH:
+ case DOM_HTML_ELEMENT_TYPE_TD:
+ css_hint_width(pw, node);
+ css_hint_table_cell_border_padding(pw, node);
+ /* fallthrough */
+ case DOM_HTML_ELEMENT_TYPE_TR:
+ css_hint_height(pw, node);
+ /* fallthrough */
+ case DOM_HTML_ELEMENT_TYPE_THEAD:
+ case DOM_HTML_ELEMENT_TYPE_TBODY:
+ case DOM_HTML_ELEMENT_TYPE_TFOOT:
+ css_hint_text_align_special(pw, node);
+ /* fallthrough */
+ case DOM_HTML_ELEMENT_TYPE_COL:
+ css_hint_vertical_align_table_cells(pw, node);
+ break;
+ case DOM_HTML_ELEMENT_TYPE_APPLET:
+ case DOM_HTML_ELEMENT_TYPE_IMG:
+ css_hint_margin_hspace_vspace(pw, node);
+ /* fallthrough */
+ case DOM_HTML_ELEMENT_TYPE_EMBED:
+ case DOM_HTML_ELEMENT_TYPE_IFRAME:
+ case DOM_HTML_ELEMENT_TYPE_OBJECT:
+ css_hint_height(pw, node);
+ css_hint_width(pw, node);
+ css_hint_vertical_align_replaced(pw, node);
+ css_hint_float(pw, node);
+ break;
+ case DOM_HTML_ELEMENT_TYPE_P:
+ case DOM_HTML_ELEMENT_TYPE_H1:
+ case DOM_HTML_ELEMENT_TYPE_H2:
+ case DOM_HTML_ELEMENT_TYPE_H3:
+ case DOM_HTML_ELEMENT_TYPE_H4:
+ case DOM_HTML_ELEMENT_TYPE_H5:
+ case DOM_HTML_ELEMENT_TYPE_H6:
+ css_hint_text_align_normal(pw, node);
+ break;
+ case DOM_HTML_ELEMENT_TYPE_CENTER:
+ css_hint_text_align_center(pw, node);
+ break;
+ case DOM_HTML_ELEMENT_TYPE_CAPTION:
+ css_hint_caption_side(pw, node);
+ /* fallthrough */
+ case DOM_HTML_ELEMENT_TYPE_DIV:
+ css_hint_text_align_special(pw, node);
+ break;
+ case DOM_HTML_ELEMENT_TYPE_TABLE:
+ css_hint_text_align_table_special(pw, node);
+ css_hint_table_spacing_border(pw, node);
+ css_hint_float(pw, node);
+ css_hint_margin_left_right_align_center(pw, node);
+ css_hint_width(pw, node);
+ break;
+ case DOM_HTML_ELEMENT_TYPE_HR:
+ css_hint_margin_left_right_hr(pw, node);
+ break;
+ case DOM_HTML_ELEMENT_TYPE_TEXTAREA:
+ css_hint_height_width_textarea(pw, node);
+ break;
+ case DOM_HTML_ELEMENT_TYPE_INPUT:
+ css_hint_width_input(pw, node);
+ break;
+ case DOM_HTML_ELEMENT_TYPE_A:
+ css_hint_anchor_color(pw, node);
+ break;
+ case DOM_HTML_ELEMENT_TYPE_FONT:
+ css_hint_font_size(pw, node);
+ break;
+ case DOM_HTML_ELEMENT_TYPE_BODY:
+ css_hint_body_color(pw, node);
+ break;
+ default:
+ break;
+ }
+
+ if (tag_type != DOM_HTML_ELEMENT_TYPE__UNKNOWN) {
+ css_hint_color(pw, node);
+ css_hint_bg_color(pw, node);
+ css_hint_bg_image(pw, node);
+ }
+
+#ifdef LOG_STATS
+ LOG("Properties with hints: %i", hint_ctx.len);
+#endif
+
+ css_hint_get_hints(hints, nhints);
+
+ return CSS_OK;
+}
diff --git a/content/handlers/css/hints.h b/content/handlers/css/hints.h
new file mode 100644
index 0000000..2c18359
--- /dev/null
+++ b/content/handlers/css/hints.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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 NETSURF_CSS_HINTS_H_
+#define NETSURF_CSS_HINTS_H_
+
+#include <stdint.h>
+
+#include <libcss/libcss.h>
+
+nserror css_hint_init(void);
+void css_hint_fini(void);
+
+/**
+ * Callback to retrieve presentational hints for a node
+ *
+ * \param[in] pw HTML document
+ * \param[in] node DOM node
+ * \param[out] nhints number of hints retrived
+ * \param[out] hints retrived hints
+ * \return CSS_OK on success,
+ * CSS_PROPERTY_NOT_SET if there is no hint for the requested property,
+ * CSS_NOMEM on memory exhaustion.
+ */
+css_error node_presentational_hint(
+ void *pw,
+ void *node,
+ uint32_t *nhints,
+ css_hint **hints);
+
+/**
+ * Parser for colours specified in attribute values.
+ *
+ * \param data Data to parse (NUL-terminated)
+ * \param result Pointer to location to receive resulting css_color
+ * \return true on success, false on invalid input
+ */
+bool nscss_parse_colour(const char *data, css_color *result);
+
+#endif
diff --git a/content/handlers/css/internal.c b/content/handlers/css/internal.c
new file mode 100644
index 0000000..d66b87a
--- /dev/null
+++ b/content/handlers/css/internal.c
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+#include <string.h>
+#include <libcss/libcss.h>
+
+#include "utils/nsurl.h"
+
+#include "internal.h"
+
+/* exported interface documented in content/handlers/css/internal.h */
+css_error nscss_resolve_url(void *pw, const char *base,
+ lwc_string *rel, lwc_string **abs)
+{
+ lwc_error lerror;
+ nserror error;
+ nsurl *nsbase;
+ nsurl *nsabs;
+
+ /* Create nsurl from base */
+ /* TODO: avoid this */
+ error = nsurl_create(base, &nsbase);
+ if (error != NSERROR_OK) {
+ return error == NSERROR_NOMEM ? CSS_NOMEM : CSS_INVALID;
+ }
+
+ /* Resolve URI */
+ error = nsurl_join(nsbase, lwc_string_data(rel), &nsabs);
+ if (error != NSERROR_OK) {
+ nsurl_unref(nsbase);
+ return error == NSERROR_NOMEM ? CSS_NOMEM : CSS_INVALID;
+ }
+
+ nsurl_unref(nsbase);
+
+ /* Intern it */
+ lerror = lwc_intern_string(nsurl_access(nsabs),
+ nsurl_length(nsabs), abs);
+ if (lerror != lwc_error_ok) {
+ *abs = NULL;
+ nsurl_unref(nsabs);
+ return lerror == lwc_error_oom ? CSS_NOMEM : CSS_INVALID;
+ }
+
+ nsurl_unref(nsabs);
+
+ return CSS_OK;
+}
diff --git a/content/handlers/css/internal.h b/content/handlers/css/internal.h
new file mode 100644
index 0000000..5c539c8
--- /dev/null
+++ b/content/handlers/css/internal.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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 NETSURF_CSS_INTERNAL_H_
+#define NETSURF_CSS_INTERNAL_H_
+
+/**
+ * URL resolution callback for libcss
+ *
+ * \param pw Resolution context
+ * \param base Base URI
+ * \param rel Relative URL
+ * \param abs Pointer to location to receive resolved URL
+ * \return CSS_OK on success,
+ * CSS_NOMEM on memory exhaustion,
+ * CSS_INVALID if resolution failed.
+ */
+css_error nscss_resolve_url(void *pw, const char *base, lwc_string *rel, lwc_string **abs);
+
+#endif
diff --git a/content/handlers/css/select.c b/content/handlers/css/select.c
new file mode 100644
index 0000000..ea324e7
--- /dev/null
+++ b/content/handlers/css/select.c
@@ -0,0 +1,1854 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+#include <assert.h>
+#include <string.h>
+#include <strings.h>
+
+#include "content/urldb.h"
+#include "desktop/system_colour.h"
+#include "utils/nsoption.h"
+#include "utils/corestrings.h"
+#include "utils/log.h"
+
+#include "internal.h"
+#include "hints.h"
+#include "select.h"
+
+static css_error node_name(void *pw, void *node, css_qname *qname);
+static css_error node_classes(void *pw, void *node,
+ lwc_string ***classes, uint32_t *n_classes);
+static css_error node_id(void *pw, void *node, lwc_string **id);
+static css_error named_parent_node(void *pw, void *node,
+ const css_qname *qname, void **parent);
+static css_error named_sibling_node(void *pw, void *node,
+ const css_qname *qname, void **sibling);
+static css_error named_generic_sibling_node(void *pw, void *node,
+ const css_qname *qname, void **sibling);
+static css_error parent_node(void *pw, void *node, void **parent);
+static css_error sibling_node(void *pw, void *node, void **sibling);
+static css_error node_has_name(void *pw, void *node,
+ const css_qname *qname, bool *match);
+static css_error node_has_class(void *pw, void *node,
+ lwc_string *name, bool *match);
+static css_error node_has_id(void *pw, void *node,
+ lwc_string *name, bool *match);
+static css_error node_has_attribute(void *pw, void *node,
+ const css_qname *qname, bool *match);
+static css_error node_has_attribute_equal(void *pw, void *node,
+ const css_qname *qname, lwc_string *value,
+ bool *match);
+static css_error node_has_attribute_dashmatch(void *pw, void *node,
+ const css_qname *qname, lwc_string *value,
+ bool *match);
+static css_error node_has_attribute_includes(void *pw, void *node,
+ const css_qname *qname, lwc_string *value,
+ bool *match);
+static css_error node_has_attribute_prefix(void *pw, void *node,
+ const css_qname *qname, lwc_string *value,
+ bool *match);
+static css_error node_has_attribute_suffix(void *pw, void *node,
+ const css_qname *qname, lwc_string *value,
+ bool *match);
+static css_error node_has_attribute_substring(void *pw, void *node,
+ const css_qname *qname, lwc_string *value,
+ bool *match);
+static css_error node_is_root(void *pw, void *node, bool *match);
+static css_error node_count_siblings(void *pw, void *node,
+ bool same_name, bool after, int32_t *count);
+static css_error node_is_empty(void *pw, void *node, bool *match);
+static css_error node_is_link(void *pw, void *node, bool *match);
+static css_error node_is_hover(void *pw, void *node, bool *match);
+static css_error node_is_active(void *pw, void *node, bool *match);
+static css_error node_is_focus(void *pw, void *node, bool *match);
+static css_error node_is_enabled(void *pw, void *node, bool *match);
+static css_error node_is_disabled(void *pw, void *node, bool *match);
+static css_error node_is_checked(void *pw, void *node, bool *match);
+static css_error node_is_target(void *pw, void *node, bool *match);
+static css_error node_is_lang(void *pw, void *node,
+ lwc_string *lang, bool *match);
+static css_error ua_default_for_property(void *pw, uint32_t property,
+ css_hint *hint);
+static css_error set_libcss_node_data(void *pw, void *node,
+ void *libcss_node_data);
+static css_error get_libcss_node_data(void *pw, void *node,
+ void **libcss_node_data);
+
+static css_error nscss_compute_font_size(void *pw, const css_hint *parent,
+ css_hint *size);
+
+
+/**
+ * Selection callback table for libcss
+ */
+static css_select_handler selection_handler = {
+ CSS_SELECT_HANDLER_VERSION_1,
+
+ node_name,
+ node_classes,
+ node_id,
+ named_ancestor_node,
+ named_parent_node,
+ named_sibling_node,
+ named_generic_sibling_node,
+ parent_node,
+ sibling_node,
+ node_has_name,
+ node_has_class,
+ node_has_id,
+ node_has_attribute,
+ node_has_attribute_equal,
+ node_has_attribute_dashmatch,
+ node_has_attribute_includes,
+ node_has_attribute_prefix,
+ node_has_attribute_suffix,
+ node_has_attribute_substring,
+ node_is_root,
+ node_count_siblings,
+ node_is_empty,
+ node_is_link,
+ node_is_visited,
+ node_is_hover,
+ node_is_active,
+ node_is_focus,
+ node_is_enabled,
+ node_is_disabled,
+ node_is_checked,
+ node_is_target,
+ node_is_lang,
+ node_presentational_hint,
+ ua_default_for_property,
+ nscss_compute_font_size,
+ set_libcss_node_data,
+ get_libcss_node_data
+};
+
+/**
+ * Create an inline style
+ *
+ * \param data Source data
+ * \param len Length of data in bytes
+ * \param charset Charset of data, or NULL if unknown
+ * \param url Base URL of document containing data
+ * \param allow_quirks True to permit CSS parsing quirks
+ * \return Pointer to stylesheet, or NULL on failure.
+ */
+css_stylesheet *nscss_create_inline_style(const uint8_t *data, size_t len,
+ const char *charset, const char *url, bool allow_quirks)
+{
+ css_stylesheet_params params;
+ css_stylesheet *sheet;
+ css_error error;
+
+ params.params_version = CSS_STYLESHEET_PARAMS_VERSION_1;
+ params.level = CSS_LEVEL_DEFAULT;
+ params.charset = charset;
+ params.url = url;
+ params.title = NULL;
+ params.allow_quirks = allow_quirks;
+ params.inline_style = true;
+ params.resolve = nscss_resolve_url;
+ params.resolve_pw = NULL;
+ params.import = NULL;
+ params.import_pw = NULL;
+ params.color = ns_system_colour;
+ params.color_pw = NULL;
+ params.font = NULL;
+ params.font_pw = NULL;
+
+ error = css_stylesheet_create(¶ms, &sheet);
+ if (error != CSS_OK) {
+ LOG("Failed creating sheet: %d", error);
+ return NULL;
+ }
+
+ error = css_stylesheet_append_data(sheet, data, len);
+ if (error != CSS_OK && error != CSS_NEEDDATA) {
+ LOG("failed appending data: %d", error);
+ css_stylesheet_destroy(sheet);
+ return NULL;
+ }
+
+ error = css_stylesheet_data_done(sheet);
+ if (error != CSS_OK) {
+ LOG("failed completing parse: %d", error);
+ css_stylesheet_destroy(sheet);
+ return NULL;
+ }
+
+ return sheet;
+}
+
+/* Handler for libcss_node_data, stored as libdom node user data */
+static void nscss_dom_user_data_handler(dom_node_operation operation,
+ dom_string *key, void *data, struct dom_node *src,
+ struct dom_node *dst)
+{
+ css_error error;
+
+ if (dom_string_isequal(corestring_dom___ns_key_libcss_node_data,
+ key) == false || data == NULL) {
+ return;
+ }
+
+ switch (operation) {
+ case DOM_NODE_CLONED:
+ error = css_libcss_node_data_handler(&selection_handler,
+ CSS_NODE_CLONED,
+ NULL, src, dst, data);
+ if (error != CSS_OK)
+ LOG("Failed to clone libcss_node_data.");
+ break;
+
+ case DOM_NODE_RENAMED:
+ error = css_libcss_node_data_handler(&selection_handler,
+ CSS_NODE_MODIFIED,
+ NULL, src, NULL, data);
+ if (error != CSS_OK)
+ LOG("Failed to update libcss_node_data.");
+ break;
+
+ case DOM_NODE_IMPORTED:
+ case DOM_NODE_ADOPTED:
+ case DOM_NODE_DELETED:
+ error = css_libcss_node_data_handler(&selection_handler,
+ CSS_NODE_DELETED,
+ NULL, src, NULL, data);
+ if (error != CSS_OK)
+ LOG("Failed to delete libcss_node_data.");
+ break;
+
+ default:
+ LOG("User data operation not handled.");
+ assert(0);
+ }
+}
+
+/**
+ * Get style selection results for an element
+ *
+ * \param ctx CSS selection context
+ * \param n Element to select for
+ * \param media Permitted media types
+ * \param inline_style Inline style associated with element, or NULL
+ * \return Pointer to selection results (containing computed styles),
+ * or NULL on failure
+ */
+css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
+ uint64_t media, const css_stylesheet *inline_style)
+{
+ css_select_results *styles;
+ int pseudo_element;
+ css_error error;
+
+ /* Select style for node */
+ error = css_select_style(ctx->ctx, n, media, inline_style,
+ &selection_handler, ctx, &styles);
+
+ if (error != CSS_OK || styles == NULL) {
+ /* Failed selecting partial style -- bail out */
+ return NULL;
+ }
+
+ /* If there's a parent style, compose with partial to obtain
+ * complete computed style for element */
+ if (ctx->parent_style != NULL) {
+ /* Complete the computed style, by composing with the parent
+ * element's style */
+ error = css_computed_style_compose(ctx->parent_style,
+ styles->styles[CSS_PSEUDO_ELEMENT_NONE],
+ nscss_compute_font_size, NULL,
+ styles->styles[CSS_PSEUDO_ELEMENT_NONE]);
+ if (error != CSS_OK) {
+ css_select_results_destroy(styles);
+ return NULL;
+ }
+ }
+
+ for (pseudo_element = CSS_PSEUDO_ELEMENT_NONE + 1;
+ pseudo_element < CSS_PSEUDO_ELEMENT_COUNT;
+ pseudo_element++) {
+
+ if (pseudo_element == CSS_PSEUDO_ELEMENT_FIRST_LETTER ||
+ pseudo_element == CSS_PSEUDO_ELEMENT_FIRST_LINE)
+ /* TODO: Handle first-line and first-letter pseudo
+ * element computed style completion */
+ continue;
+
+ if (styles->styles[pseudo_element] == NULL)
+ /* There were no rules concerning this pseudo element */
+ continue;
+
+ /* Complete the pseudo element's computed style, by composing
+ * with the base element's style */
+ error = css_computed_style_compose(
+ styles->styles[CSS_PSEUDO_ELEMENT_NONE],
+ styles->styles[pseudo_element],
+ nscss_compute_font_size, NULL,
+ styles->styles[pseudo_element]);
+ if (error != CSS_OK) {
+ /* TODO: perhaps this shouldn't be quite so
+ * catastrophic? */
+ css_select_results_destroy(styles);
+ return NULL;
+ }
+ }
+
+ return styles;
+}
+
+/**
+ * Get an initial style
+ *
+ * \param ctx CSS selection context
+ * \return Pointer to partial computed style, or NULL on failure
+ */
+static css_computed_style *nscss_get_initial_style(nscss_select_ctx *ctx)
+{
+ css_computed_style *style;
+ css_error error;
+
+ error = css_computed_style_create(&style);
+ if (error != CSS_OK)
+ return NULL;
+
+ error = css_computed_style_initialise(style, &selection_handler, ctx);
+ if (error != CSS_OK) {
+ css_computed_style_destroy(style);
+ return NULL;
+ }
+
+ return style;
+}
+
+/**
+ * Get a blank style
+ *
+ * \param ctx CSS selection context
+ * \param parent Parent style to cascade inherited properties from
+ * \return Pointer to blank style, or NULL on failure
+ */
+css_computed_style *nscss_get_blank_style(nscss_select_ctx *ctx,
+ const css_computed_style *parent)
+{
+ css_computed_style *partial;
+ css_error error;
+
+ partial = nscss_get_initial_style(ctx);
+ if (partial == NULL)
+ return NULL;
+
+ error = css_computed_style_compose(parent, partial,
+ nscss_compute_font_size, NULL, partial);
+ if (error != CSS_OK) {
+ css_computed_style_destroy(partial);
+ return NULL;
+ }
+
+ return partial;
+}
+
+/**
+ * Font size computation callback for libcss
+ *
+ * \param pw Computation context
+ * \param parent Parent font size (absolute)
+ * \param size Font size to compute
+ * \return CSS_OK on success
+ *
+ * \post \a size will be an absolute font size
+ */
+css_error nscss_compute_font_size(void *pw, const css_hint *parent,
+ css_hint *size)
+{
+ /**
+ * Table of font-size keyword scale factors
+ *
+ * These are multiplied by the configured default font size
+ * to produce an absolute size for the relevant keyword
+ */
+ static const css_fixed factors[] = {
+ FLTTOFIX(0.5625), /* xx-small */
+ FLTTOFIX(0.6250), /* x-small */
+ FLTTOFIX(0.8125), /* small */
+ FLTTOFIX(1.0000), /* medium */
+ FLTTOFIX(1.1250), /* large */
+ FLTTOFIX(1.5000), /* x-large */
+ FLTTOFIX(2.0000) /* xx-large */
+ };
+ css_hint_length parent_size;
+
+ /* Grab parent size, defaulting to medium if none */
+ if (parent == NULL) {
+ parent_size.value = FDIV(FMUL(factors[CSS_FONT_SIZE_MEDIUM - 1],
+ INTTOFIX(nsoption_int(font_size))),
+ INTTOFIX(10));
+ parent_size.unit = CSS_UNIT_PT;
+ } else {
+ assert(parent->status == CSS_FONT_SIZE_DIMENSION);
+ assert(parent->data.length.unit != CSS_UNIT_EM);
+ assert(parent->data.length.unit != CSS_UNIT_EX);
+ assert(parent->data.length.unit != CSS_UNIT_PCT);
+
+ parent_size = parent->data.length;
+ }
+
+ assert(size->status != CSS_FONT_SIZE_INHERIT);
+
+ if (size->status < CSS_FONT_SIZE_LARGER) {
+ /* Keyword -- simple */
+ size->data.length.value = FDIV(FMUL(factors[size->status - 1],
+ INTTOFIX(nsoption_int(font_size))), F_10);
+ size->data.length.unit = CSS_UNIT_PT;
+ } else if (size->status == CSS_FONT_SIZE_LARGER) {
+ /** \todo Step within table, if appropriate */
+ size->data.length.value =
+ FMUL(parent_size.value, FLTTOFIX(1.2));
+ size->data.length.unit = parent_size.unit;
+ } else if (size->status == CSS_FONT_SIZE_SMALLER) {
+ /** \todo Step within table, if appropriate */
+ size->data.length.value =
+ FDIV(parent_size.value, FLTTOFIX(1.2));
+ size->data.length.unit = parent_size.unit;
+ } else if (size->data.length.unit == CSS_UNIT_EM ||
+ size->data.length.unit == CSS_UNIT_EX) {
+ size->data.length.value =
+ FMUL(size->data.length.value, parent_size.value);
+
+ if (size->data.length.unit == CSS_UNIT_EX) {
+ /* 1ex = 0.6em in NetSurf */
+ size->data.length.value = FMUL(size->data.length.value,
+ FLTTOFIX(0.6));
+ }
+
+ size->data.length.unit = parent_size.unit;
+ } else if (size->data.length.unit == CSS_UNIT_PCT) {
+ size->data.length.value = FDIV(FMUL(size->data.length.value,
+ parent_size.value), INTTOFIX(100));
+ size->data.length.unit = parent_size.unit;
+ }
+
+ size->status = CSS_FONT_SIZE_DIMENSION;
+
+ return CSS_OK;
+}
+
+/******************************************************************************
+ * Style selection callbacks *
+ ******************************************************************************/
+
+/**
+ * Callback to retrieve a node's name.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param qname Pointer to location to receive node name
+ * \return CSS_OK on success,
+ * CSS_NOMEM on memory exhaustion.
+ */
+css_error node_name(void *pw, void *node, css_qname *qname)
+{
+ dom_node *n = node;
+ dom_string *name;
+ dom_exception err;
+
+ err = dom_node_get_node_name(n, &name);
+ if (err != DOM_NO_ERR)
+ return CSS_NOMEM;
+
+ qname->ns = NULL;
+
+ err = dom_string_intern(name, &qname->name);
+ if (err != DOM_NO_ERR) {
+ dom_string_unref(name);
+ return CSS_NOMEM;
+ }
+
+ dom_string_unref(name);
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to retrieve a node's classes.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param classes Pointer to location to receive class name array
+ * \param n_classes Pointer to location to receive length of class name array
+ * \return CSS_OK on success,
+ * CSS_NOMEM on memory exhaustion.
+ *
+ * \note The returned array will be destroyed by libcss. Therefore, it must
+ * be allocated using the same allocator as used by libcss during style
+ * selection.
+ */
+css_error node_classes(void *pw, void *node,
+ lwc_string ***classes, uint32_t *n_classes)
+{
+ dom_node *n = node;
+ dom_exception err;
+
+ *classes = NULL;
+ *n_classes = 0;
+
+ err = dom_element_get_classes(n, classes, n_classes);
+ if (err != DOM_NO_ERR)
+ return CSS_NOMEM;
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to retrieve a node's ID.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param id Pointer to location to receive id value
+ * \return CSS_OK on success,
+ * CSS_NOMEM on memory exhaustion.
+ */
+css_error node_id(void *pw, void *node, lwc_string **id)
+{
+ dom_node *n = node;
+ dom_string *attr;
+ dom_exception err;
+
+ *id = NULL;
+
+ /** \todo Assumes an HTML DOM */
+ err = dom_html_element_get_id(n, &attr);
+ if (err != DOM_NO_ERR)
+ return CSS_NOMEM;
+
+ if (attr != NULL) {
+ err = dom_string_intern(attr, id);
+ if (err != DOM_NO_ERR) {
+ dom_string_unref(attr);
+ return CSS_NOMEM;
+ }
+ dom_string_unref(attr);
+ }
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to find a named ancestor node.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param qname Node name to search for
+ * \param ancestor Pointer to location to receive ancestor
+ * \return CSS_OK.
+ *
+ * \post \a ancestor will contain the result, or NULL if there is no match
+ */
+css_error named_ancestor_node(void *pw, void *node,
+ const css_qname *qname, void **ancestor)
+{
+ dom_element_named_ancestor_node(node, qname->name,
+ (struct dom_element **)ancestor);
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to find a named parent node
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param qname Node name to search for
+ * \param parent Pointer to location to receive parent
+ * \return CSS_OK.
+ *
+ * \post \a parent will contain the result, or NULL if there is no match
+ */
+css_error named_parent_node(void *pw, void *node,
+ const css_qname *qname, void **parent)
+{
+ dom_element_named_parent_node(node, qname->name,
+ (struct dom_element **)parent);
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to find a named sibling node.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param qname Node name to search for
+ * \param sibling Pointer to location to receive sibling
+ * \return CSS_OK.
+ *
+ * \post \a sibling will contain the result, or NULL if there is no match
+ */
+css_error named_sibling_node(void *pw, void *node,
+ const css_qname *qname, void **sibling)
+{
+ dom_node *n = node;
+ dom_node *prev;
+ dom_exception err;
+
+ *sibling = NULL;
+
+ /* Find sibling element */
+ err = dom_node_get_previous_sibling(n, &n);
+ if (err != DOM_NO_ERR)
+ return CSS_OK;
+
+ while (n != NULL) {
+ dom_node_type type;
+
+ err = dom_node_get_node_type(n, &type);
+ if (err != DOM_NO_ERR) {
+ dom_node_unref(n);
+ return CSS_OK;
+ }
+
+ if (type == DOM_ELEMENT_NODE)
+ break;
+
+ err = dom_node_get_previous_sibling(n, &prev);
+ if (err != DOM_NO_ERR) {
+ dom_node_unref(n);
+ return CSS_OK;
+ }
+
+ dom_node_unref(n);
+ n = prev;
+ }
+
+ if (n != NULL) {
+ dom_string *name;
+
+ err = dom_node_get_node_name(n, &name);
+ if (err != DOM_NO_ERR) {
+ dom_node_unref(n);
+ return CSS_OK;
+ }
+
+ dom_node_unref(n);
+
+ if (dom_string_caseless_lwc_isequal(name, qname->name)) {
+ *sibling = n;
+ }
+
+ dom_string_unref(name);
+ }
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to find a named generic sibling node.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param qname Node name to search for
+ * \param sibling Pointer to location to receive ancestor
+ * \return CSS_OK.
+ *
+ * \post \a sibling will contain the result, or NULL if there is no match
+ */
+css_error named_generic_sibling_node(void *pw, void *node,
+ const css_qname *qname, void **sibling)
+{
+ dom_node *n = node;
+ dom_node *prev;
+ dom_exception err;
+
+ *sibling = NULL;
+
+ err = dom_node_get_previous_sibling(n, &n);
+ if (err != DOM_NO_ERR)
+ return CSS_OK;
+
+ while (n != NULL) {
+ dom_node_type type;
+ dom_string *name;
+
+ err = dom_node_get_node_type(n, &type);
+ if (err != DOM_NO_ERR) {
+ dom_node_unref(n);
+ return CSS_OK;
+ }
+
+ if (type == DOM_ELEMENT_NODE) {
+ err = dom_node_get_node_name(n, &name);
+ if (err != DOM_NO_ERR) {
+ dom_node_unref(n);
+ return CSS_OK;
+ }
+
+ if (dom_string_caseless_lwc_isequal(name,
+ qname->name)) {
+ dom_string_unref(name);
+ dom_node_unref(n);
+ *sibling = n;
+ break;
+ }
+ dom_string_unref(name);
+ }
+
+ err = dom_node_get_previous_sibling(n, &prev);
+ if (err != DOM_NO_ERR) {
+ dom_node_unref(n);
+ return CSS_OK;
+ }
+
+ dom_node_unref(n);
+ n = prev;
+ }
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to retrieve the parent of a node.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param parent Pointer to location to receive parent
+ * \return CSS_OK.
+ *
+ * \post \a parent will contain the result, or NULL if there is no match
+ */
+css_error parent_node(void *pw, void *node, void **parent)
+{
+ dom_element_parent_node(node, (struct dom_element **)parent);
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to retrieve the preceding sibling of a node.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param sibling Pointer to location to receive sibling
+ * \return CSS_OK.
+ *
+ * \post \a sibling will contain the result, or NULL if there is no match
+ */
+css_error sibling_node(void *pw, void *node, void **sibling)
+{
+ dom_node *n = node;
+ dom_node *prev;
+ dom_exception err;
+
+ *sibling = NULL;
+
+ /* Find sibling element */
+ err = dom_node_get_previous_sibling(n, &n);
+ if (err != DOM_NO_ERR)
+ return CSS_OK;
+
+ while (n != NULL) {
+ dom_node_type type;
+
+ err = dom_node_get_node_type(n, &type);
+ if (err != DOM_NO_ERR) {
+ dom_node_unref(n);
+ return CSS_OK;
+ }
+
+ if (type == DOM_ELEMENT_NODE)
+ break;
+
+ err = dom_node_get_previous_sibling(n, &prev);
+ if (err != DOM_NO_ERR) {
+ dom_node_unref(n);
+ return CSS_OK;
+ }
+
+ dom_node_unref(n);
+ n = prev;
+ }
+
+ if (n != NULL) {
+ /** \todo Sort out reference counting */
+ dom_node_unref(n);
+
+ *sibling = n;
+ }
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node has the given name.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param qname Name to match
+ * \param match Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_has_name(void *pw, void *node,
+ const css_qname *qname, bool *match)
+{
+ nscss_select_ctx *ctx = pw;
+ dom_node *n = node;
+
+ if (lwc_string_isequal(qname->name, ctx->universal, match) ==
+ lwc_error_ok && *match == false) {
+ dom_string *name;
+ dom_exception err;
+
+ err = dom_node_get_node_name(n, &name);
+ if (err != DOM_NO_ERR)
+ return CSS_OK;
+
+ /* Element names are case insensitive in HTML */
+ *match = dom_string_caseless_lwc_isequal(name, qname->name);
+
+ dom_string_unref(name);
+ }
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node has the given class.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param name Name to match
+ * \param match Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_has_class(void *pw, void *node,
+ lwc_string *name, bool *match)
+{
+ dom_node *n = node;
+ dom_exception err;
+
+ /** \todo: Ensure that libdom performs case-insensitive
+ * matching in quirks mode */
+ err = dom_element_has_class(n, name, match);
+
+ assert(err == DOM_NO_ERR);
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node has the given id.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param name Name to match
+ * \param match Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_has_id(void *pw, void *node,
+ lwc_string *name, bool *match)
+{
+ dom_node *n = node;
+ dom_string *attr;
+ dom_exception err;
+
+ *match = false;
+
+ /** \todo Assumes an HTML DOM */
+ err = dom_html_element_get_id(n, &attr);
+ if (err != DOM_NO_ERR)
+ return CSS_OK;
+
+ if (attr != NULL) {
+ *match = dom_string_lwc_isequal(attr, name);
+
+ dom_string_unref(attr);
+ }
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node has an attribute with the given name.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param qname Name to match
+ * \param match Pointer to location to receive result
+ * \return CSS_OK on success,
+ * CSS_NOMEM on memory exhaustion.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_has_attribute(void *pw, void *node,
+ const css_qname *qname, bool *match)
+{
+ dom_node *n = node;
+ dom_string *name;
+ dom_exception err;
+
+ err = dom_string_create_interned(
+ (const uint8_t *) lwc_string_data(qname->name),
+ lwc_string_length(qname->name), &name);
+ if (err != DOM_NO_ERR)
+ return CSS_NOMEM;
+
+ err = dom_element_has_attribute(n, name, match);
+ if (err != DOM_NO_ERR) {
+ dom_string_unref(name);
+ return CSS_OK;
+ }
+
+ dom_string_unref(name);
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node has an attribute with given name and value.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param qname Name to match
+ * \param value Value to match
+ * \param match Pointer to location to receive result
+ * \return CSS_OK on success,
+ * CSS_NOMEM on memory exhaustion.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_has_attribute_equal(void *pw, void *node,
+ const css_qname *qname, lwc_string *value,
+ bool *match)
+{
+ dom_node *n = node;
+ dom_string *name;
+ dom_string *atr_val;
+ dom_exception err;
+
+ size_t vlen = lwc_string_length(value);
+
+ if (vlen == 0) {
+ *match = false;
+ return CSS_OK;
+ }
+
+ err = dom_string_create_interned(
+ (const uint8_t *) lwc_string_data(qname->name),
+ lwc_string_length(qname->name), &name);
+ if (err != DOM_NO_ERR)
+ return CSS_NOMEM;
+
+ err = dom_element_get_attribute(n, name, &atr_val);
+ if ((err != DOM_NO_ERR) || (atr_val == NULL)) {
+ dom_string_unref(name);
+ *match = false;
+ return CSS_OK;
+ }
+
+ dom_string_unref(name);
+
+ *match = dom_string_caseless_lwc_isequal(atr_val, value);
+
+ dom_string_unref(atr_val);
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node has an attribute with the given name whose
+ * value dashmatches that given.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param qname Name to match
+ * \param value Value to match
+ * \param match Pointer to location to receive result
+ * \return CSS_OK on success,
+ * CSS_NOMEM on memory exhaustion.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_has_attribute_dashmatch(void *pw, void *node,
+ const css_qname *qname, lwc_string *value,
+ bool *match)
+{
+ dom_node *n = node;
+ dom_string *name;
+ dom_string *atr_val;
+ dom_exception err;
+
+ size_t vlen = lwc_string_length(value);
+
+ if (vlen == 0) {
+ *match = false;
+ return CSS_OK;
+ }
+
+ err = dom_string_create_interned(
+ (const uint8_t *) lwc_string_data(qname->name),
+ lwc_string_length(qname->name), &name);
+ if (err != DOM_NO_ERR)
+ return CSS_NOMEM;
+
+ err = dom_element_get_attribute(n, name, &atr_val);
+ if ((err != DOM_NO_ERR) || (atr_val == NULL)) {
+ dom_string_unref(name);
+ *match = false;
+ return CSS_OK;
+ }
+
+ dom_string_unref(name);
+
+ /* check for exact match */
+ *match = dom_string_caseless_lwc_isequal(atr_val, value);
+
+ /* check for dashmatch */
+ if (*match == false) {
+ const char *vdata = lwc_string_data(value);
+ const char *data = (const char *) dom_string_data(atr_val);
+ size_t len = dom_string_byte_length(atr_val);
+
+ if (len > vlen && data[vlen] == '-' &&
+ strncasecmp(data, vdata, vlen) == 0) {
+ *match = true;
+ }
+ }
+
+ dom_string_unref(atr_val);
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node has an attribute with the given name whose
+ * value includes that given.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param qname Name to match
+ * \param value Value to match
+ * \param match Pointer to location to receive result
+ * \return CSS_OK on success,
+ * CSS_NOMEM on memory exhaustion.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_has_attribute_includes(void *pw, void *node,
+ const css_qname *qname, lwc_string *value,
+ bool *match)
+{
+ dom_node *n = node;
+ dom_string *name;
+ dom_string *atr_val;
+ dom_exception err;
+ size_t vlen = lwc_string_length(value);
+ const char *p;
+ const char *start;
+ const char *end;
+
+ *match = false;
+
+ if (vlen == 0) {
+ return CSS_OK;
+ }
+
+ err = dom_string_create_interned(
+ (const uint8_t *) lwc_string_data(qname->name),
+ lwc_string_length(qname->name), &name);
+ if (err != DOM_NO_ERR)
+ return CSS_NOMEM;
+
+ err = dom_element_get_attribute(n, name, &atr_val);
+ if ((err != DOM_NO_ERR) || (atr_val == NULL)) {
+ dom_string_unref(name);
+ *match = false;
+ return CSS_OK;
+ }
+
+ dom_string_unref(name);
+
+ /* check for match */
+ start = (const char *) dom_string_data(atr_val);
+ end = start + dom_string_byte_length(atr_val);
+
+ for (p = start; p <= end; p++) {
+ if (*p == ' ' || *p == '\0') {
+ if ((size_t) (p - start) == vlen &&
+ strncasecmp(start,
+ lwc_string_data(value),
+ vlen) == 0) {
+ *match = true;
+ break;
+ }
+
+ start = p + 1;
+ }
+ }
+
+ dom_string_unref(atr_val);
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node has an attribute with the given name whose
+ * value has the prefix given.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param qname Name to match
+ * \param value Value to match
+ * \param match Pointer to location to receive result
+ * \return CSS_OK on success,
+ * CSS_NOMEM on memory exhaustion.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_has_attribute_prefix(void *pw, void *node,
+ const css_qname *qname, lwc_string *value,
+ bool *match)
+{
+ dom_node *n = node;
+ dom_string *name;
+ dom_string *atr_val;
+ dom_exception err;
+
+ size_t vlen = lwc_string_length(value);
+
+ if (vlen == 0) {
+ *match = false;
+ return CSS_OK;
+ }
+
+ err = dom_string_create_interned(
+ (const uint8_t *) lwc_string_data(qname->name),
+ lwc_string_length(qname->name), &name);
+ if (err != DOM_NO_ERR)
+ return CSS_NOMEM;
+
+ err = dom_element_get_attribute(n, name, &atr_val);
+ if ((err != DOM_NO_ERR) || (atr_val == NULL)) {
+ dom_string_unref(name);
+ *match = false;
+ return CSS_OK;
+ }
+
+ dom_string_unref(name);
+
+ /* check for exact match */
+ *match = dom_string_caseless_lwc_isequal(atr_val, value);
+
+ /* check for prefix match */
+ if (*match == false) {
+ const char *data = (const char *) dom_string_data(atr_val);
+ size_t len = dom_string_byte_length(atr_val);
+
+ if ((len >= vlen) &&
+ (strncasecmp(data, lwc_string_data(value), vlen) == 0)) {
+ *match = true;
+ }
+ }
+
+ dom_string_unref(atr_val);
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node has an attribute with the given name whose
+ * value has the suffix given.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param qname Name to match
+ * \param value Value to match
+ * \param match Pointer to location to receive result
+ * \return CSS_OK on success,
+ * CSS_NOMEM on memory exhaustion.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_has_attribute_suffix(void *pw, void *node,
+ const css_qname *qname, lwc_string *value,
+ bool *match)
+{
+ dom_node *n = node;
+ dom_string *name;
+ dom_string *atr_val;
+ dom_exception err;
+
+ size_t vlen = lwc_string_length(value);
+
+ if (vlen == 0) {
+ *match = false;
+ return CSS_OK;
+ }
+
+ err = dom_string_create_interned(
+ (const uint8_t *) lwc_string_data(qname->name),
+ lwc_string_length(qname->name), &name);
+ if (err != DOM_NO_ERR)
+ return CSS_NOMEM;
+
+ err = dom_element_get_attribute(n, name, &atr_val);
+ if ((err != DOM_NO_ERR) || (atr_val == NULL)) {
+ dom_string_unref(name);
+ *match = false;
+ return CSS_OK;
+ }
+
+ dom_string_unref(name);
+
+ /* check for exact match */
+ *match = dom_string_caseless_lwc_isequal(atr_val, value);
+
+ /* check for prefix match */
+ if (*match == false) {
+ const char *data = (const char *) dom_string_data(atr_val);
+ size_t len = dom_string_byte_length(atr_val);
+
+ const char *start = (char *) data + len - vlen;
+
+ if ((len >= vlen) &&
+ (strncasecmp(start, lwc_string_data(value), vlen) == 0)) {
+ *match = true;
+ }
+
+
+ }
+
+ dom_string_unref(atr_val);
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node has an attribute with the given name whose
+ * value contains the substring given.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param qname Name to match
+ * \param value Value to match
+ * \param match Pointer to location to receive result
+ * \return CSS_OK on success,
+ * CSS_NOMEM on memory exhaustion.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_has_attribute_substring(void *pw, void *node,
+ const css_qname *qname, lwc_string *value,
+ bool *match)
+{
+ dom_node *n = node;
+ dom_string *name;
+ dom_string *atr_val;
+ dom_exception err;
+
+ size_t vlen = lwc_string_length(value);
+
+ if (vlen == 0) {
+ *match = false;
+ return CSS_OK;
+ }
+
+ err = dom_string_create_interned(
+ (const uint8_t *) lwc_string_data(qname->name),
+ lwc_string_length(qname->name), &name);
+ if (err != DOM_NO_ERR)
+ return CSS_NOMEM;
+
+ err = dom_element_get_attribute(n, name, &atr_val);
+ if ((err != DOM_NO_ERR) || (atr_val == NULL)) {
+ dom_string_unref(name);
+ *match = false;
+ return CSS_OK;
+ }
+
+ dom_string_unref(name);
+
+ /* check for exact match */
+ *match = dom_string_caseless_lwc_isequal(atr_val, value);
+
+ /* check for prefix match */
+ if (*match == false) {
+ const char *vdata = lwc_string_data(value);
+ const char *start = (const char *) dom_string_data(atr_val);
+ size_t len = dom_string_byte_length(atr_val);
+ const char *last_start = start + len - vlen;
+
+ if (len >= vlen) {
+ while (start <= last_start) {
+ if (strncasecmp(start, vdata,
+ vlen) == 0) {
+ *match = true;
+ break;
+ }
+
+ start++;
+ }
+ }
+ }
+
+ dom_string_unref(atr_val);
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node is the root node of the document.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param match Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_is_root(void *pw, void *node, bool *match)
+{
+ dom_node *n = node;
+ dom_node *parent;
+ dom_node_type type;
+ dom_exception err;
+
+ err = dom_node_get_parent_node(n, &parent);
+ if (err != DOM_NO_ERR) {
+ return CSS_NOMEM;
+ }
+
+ if (parent != NULL) {
+ err = dom_node_get_node_type(parent, &type);
+
+ dom_node_unref(parent);
+
+ if (err != DOM_NO_ERR)
+ return CSS_NOMEM;
+
+ if (type != DOM_DOCUMENT_NODE) {
+ *match = false;
+ return CSS_OK;
+ }
+ }
+
+ *match = true;
+
+ return CSS_OK;
+}
+
+static int
+node_count_siblings_check(dom_node *node,
+ bool check_name,
+ dom_string *name)
+{
+ dom_node_type type;
+ int ret = 0;
+ dom_exception exc;
+
+ if (node == NULL)
+ return 0;
+
+ exc = dom_node_get_node_type(node, &type);
+ if ((exc != DOM_NO_ERR) || (type != DOM_ELEMENT_NODE)) {
+ return 0;
+ }
+
+ if (check_name) {
+ dom_string *node_name = NULL;
+ exc = dom_node_get_node_name(node, &node_name);
+
+ if ((exc == DOM_NO_ERR) && (node_name != NULL)) {
+
+ if (dom_string_caseless_isequal(name,
+ node_name)) {
+ ret = 1;
+ }
+ dom_string_unref(node_name);
+ }
+ } else {
+ ret = 1;
+ }
+
+ return ret;
+}
+
+/**
+ * Callback to count a node's siblings.
+ *
+ * \param pw HTML document
+ * \param n DOM node
+ * \param same_name Only count siblings with the same name, or all
+ * \param after Count anteceding instead of preceding siblings
+ * \param count Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a count will contain the number of siblings
+ */
+css_error node_count_siblings(void *pw, void *n, bool same_name,
+ bool after, int32_t *count)
+{
+ int32_t cnt = 0;
+ dom_exception exc;
+ dom_string *node_name = NULL;
+
+ if (same_name) {
+ dom_node *node = n;
+ exc = dom_node_get_node_name(node, &node_name);
+ if ((exc != DOM_NO_ERR) || (node_name == NULL)) {
+ return CSS_NOMEM;
+ }
+ }
+
+ if (after) {
+ dom_node *node = dom_node_ref(n);
+ dom_node *next;
+
+ do {
+ exc = dom_node_get_next_sibling(node, &next);
+ if ((exc != DOM_NO_ERR))
+ break;
+
+ dom_node_unref(node);
+ node = next;
+
+ cnt += node_count_siblings_check(node, same_name, node_name);
+ } while (node != NULL);
+ } else {
+ dom_node *node = dom_node_ref(n);
+ dom_node *next;
+
+ do {
+ exc = dom_node_get_previous_sibling(node, &next);
+ if ((exc != DOM_NO_ERR))
+ break;
+
+ dom_node_unref(node);
+ node = next;
+
+ cnt += node_count_siblings_check(node, same_name, node_name);
+
+ } while (node != NULL);
+ }
+
+ if (node_name != NULL) {
+ dom_string_unref(node_name);
+ }
+
+ *count = cnt;
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node is empty.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param match Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a match will contain true if the node is empty and false otherwise.
+ */
+css_error node_is_empty(void *pw, void *node, bool *match)
+{
+ dom_node *n = node, *next;
+ dom_exception err;
+
+ *match = true;
+
+ err = dom_node_get_first_child(n, &n);
+ if (err != DOM_NO_ERR) {
+ return CSS_BADPARM;
+ }
+
+ while (n != NULL) {
+ dom_node_type ntype;
+ err = dom_node_get_node_type(n, &ntype);
+ if (err != DOM_NO_ERR) {
+ dom_node_unref(n);
+ return CSS_BADPARM;
+ }
+
+ if (ntype == DOM_ELEMENT_NODE ||
+ ntype == DOM_TEXT_NODE) {
+ *match = false;
+ dom_node_unref(n);
+ break;
+ }
+
+ err = dom_node_get_next_sibling(n, &next);
+ if (err != DOM_NO_ERR) {
+ dom_node_unref(n);
+ return CSS_BADPARM;
+ }
+ dom_node_unref(n);
+ n = next;
+ }
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node is a linking element.
+ *
+ * \param pw HTML document
+ * \param n DOM node
+ * \param match Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_is_link(void *pw, void *n, bool *match)
+{
+ dom_node *node = n;
+ dom_exception exc;
+ dom_string *node_name = NULL;
+
+ exc = dom_node_get_node_name(node, &node_name);
+ if ((exc != DOM_NO_ERR) || (node_name == NULL)) {
+ return CSS_NOMEM;
+ }
+
+ if (dom_string_caseless_lwc_isequal(node_name, corestring_lwc_a)) {
+ bool has_href;
+ exc = dom_element_has_attribute(node, corestring_dom_href,
+ &has_href);
+ if ((exc == DOM_NO_ERR) && (has_href)) {
+ *match = true;
+ } else {
+ *match = false;
+ }
+ } else {
+ *match = false;
+ }
+ dom_string_unref(node_name);
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node is a linking element whose target has been
+ * visited.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param match Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_is_visited(void *pw, void *node, bool *match)
+{
+ nscss_select_ctx *ctx = pw;
+ nsurl *url;
+ nserror error;
+ const struct url_data *data;
+
+ dom_exception exc;
+ dom_node *n = node;
+ dom_string *s = NULL;
+
+ *match = false;
+
+ exc = dom_node_get_node_name(n, &s);
+ if ((exc != DOM_NO_ERR) || (s == NULL)) {
+ return CSS_NOMEM;
+ }
+
+ if (!dom_string_caseless_lwc_isequal(s, corestring_lwc_a)) {
+ /* Can't be visited; not ancher element */
+ dom_string_unref(s);
+ return CSS_OK;
+ }
+
+ /* Finished with node name string */
+ dom_string_unref(s);
+ s = NULL;
+
+ exc = dom_element_get_attribute(n, corestring_dom_href, &s);
+ if ((exc != DOM_NO_ERR) || (s == NULL)) {
+ /* Can't be visited; not got a URL */
+ return CSS_OK;
+ }
+
+ /* Make href absolute */
+ /* TODO: this duplicates what we do for box->href
+ * should we put the absolute URL on the dom node? */
+ error = nsurl_join(ctx->base_url, dom_string_data(s), &url);
+
+ /* Finished with href string */
+ dom_string_unref(s);
+
+ if (error != NSERROR_OK) {
+ /* Couldn't make nsurl object */
+ return CSS_NOMEM;
+ }
+
+ data = urldb_get_url_data(url);
+
+ /* Visited if in the db and has
+ * non-zero visit count */
+ if (data != NULL && data->visits > 0)
+ *match = true;
+
+ nsurl_unref(url);
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node is currently being hovered over.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param match Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_is_hover(void *pw, void *node, bool *match)
+{
+ /** \todo Support hovering */
+
+ *match = false;
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node is currently activated.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param match Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_is_active(void *pw, void *node, bool *match)
+{
+ /** \todo Support active nodes */
+
+ *match = false;
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node has the input focus.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param match Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_is_focus(void *pw, void *node, bool *match)
+{
+ /** \todo Support focussed nodes */
+
+ *match = false;
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node is enabled.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param match Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a match with contain true if the node is enabled and false otherwise.
+ */
+css_error node_is_enabled(void *pw, void *node, bool *match)
+{
+ /** \todo Support enabled nodes */
+
+ *match = false;
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node is disabled.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param match Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a match with contain true if the node is disabled and false otherwise.
+ */
+css_error node_is_disabled(void *pw, void *node, bool *match)
+{
+ /** \todo Support disabled nodes */
+
+ *match = false;
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node is checked.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param match Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a match with contain true if the node is checked and false otherwise.
+ */
+css_error node_is_checked(void *pw, void *node, bool *match)
+{
+ /** \todo Support checked nodes */
+
+ *match = false;
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node is the target of the document URL.
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param match Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a match with contain true if the node matches and false otherwise.
+ */
+css_error node_is_target(void *pw, void *node, bool *match)
+{
+ /** \todo Support target */
+
+ *match = false;
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to determine if a node has the given language
+ *
+ * \param pw HTML document
+ * \param node DOM node
+ * \param lang Language specifier to match
+ * \param match Pointer to location to receive result
+ * \return CSS_OK.
+ *
+ * \post \a match will contain true if the node matches and false otherwise.
+ */
+css_error node_is_lang(void *pw, void *node,
+ lwc_string *lang, bool *match)
+{
+ /** \todo Support languages */
+
+ *match = false;
+
+ return CSS_OK;
+}
+
+/**
+ * Callback to retrieve the User-Agent defaults for a CSS property.
+ *
+ * \param pw HTML document
+ * \param property Property to retrieve defaults for
+ * \param hint Pointer to hint object to populate
+ * \return CSS_OK on success,
+ * CSS_INVALID if the property should not have a user-agent default.
+ */
+css_error ua_default_for_property(void *pw, uint32_t property, css_hint *hint)
+{
+ if (property == CSS_PROP_COLOR) {
+ hint->data.color = 0xff000000;
+ hint->status = CSS_COLOR_COLOR;
+ } else if (property == CSS_PROP_FONT_FAMILY) {
+ hint->data.strings = NULL;
+ switch (nsoption_int(font_default)) {
+ case PLOT_FONT_FAMILY_SANS_SERIF:
+ hint->status = CSS_FONT_FAMILY_SANS_SERIF;
+ break;
+ case PLOT_FONT_FAMILY_SERIF:
+ hint->status = CSS_FONT_FAMILY_SERIF;
+ break;
+ case PLOT_FONT_FAMILY_MONOSPACE:
+ hint->status = CSS_FONT_FAMILY_MONOSPACE;
+ break;
+ case PLOT_FONT_FAMILY_CURSIVE:
+ hint->status = CSS_FONT_FAMILY_CURSIVE;
+ break;
+ case PLOT_FONT_FAMILY_FANTASY:
+ hint->status = CSS_FONT_FAMILY_FANTASY;
+ break;
+ }
+ } else if (property == CSS_PROP_QUOTES) {
+ /** \todo Not exactly useful :) */
+ hint->data.strings = NULL;
+ hint->status = CSS_QUOTES_NONE;
+ } else if (property == CSS_PROP_VOICE_FAMILY) {
+ /** \todo Fix this when we have voice-family done */
+ hint->data.strings = NULL;
+ hint->status = 0;
+ } else {
+ return CSS_INVALID;
+ }
+
+ return CSS_OK;
+}
+
+css_error set_libcss_node_data(void *pw, void *node, void *libcss_node_data)
+{
+ dom_node *n = node;
+ dom_exception err;
+ void *old_node_data;
+
+ /* Set this node's node data */
+ err = dom_node_set_user_data(n,
+ corestring_dom___ns_key_libcss_node_data,
+ libcss_node_data, nscss_dom_user_data_handler,
+ (void *) &old_node_data);
+ if (err != DOM_NO_ERR) {
+ return CSS_NOMEM;
+ }
+
+ assert(old_node_data == NULL);
+
+ return CSS_OK;
+}
+
+css_error get_libcss_node_data(void *pw, void *node, void **libcss_node_data)
+{
+ dom_node *n = node;
+ dom_exception err;
+
+ /* Get this node's node data */
+ err = dom_node_get_user_data(n,
+ corestring_dom___ns_key_libcss_node_data,
+ libcss_node_data);
+ if (err != DOM_NO_ERR) {
+ return CSS_NOMEM;
+ }
+
+ return CSS_OK;
+}
diff --git a/content/handlers/css/select.h b/content/handlers/css/select.h
new file mode 100644
index 0000000..abfb858
--- /dev/null
+++ b/content/handlers/css/select.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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 NETSURF_CSS_SELECT_H_
+#define NETSURF_CSS_SELECT_H_
+
+#include <stdint.h>
+
+#include <dom/dom.h>
+
+#include <libcss/libcss.h>
+
+struct content;
+struct nsurl;
+
+/**
+ * Selection context
+ */
+typedef struct nscss_select_ctx
+{
+ css_select_ctx *ctx;
+ bool quirks;
+ struct nsurl *base_url;
+ lwc_string *universal;
+ const css_computed_style *parent_style;
+} nscss_select_ctx;
+
+css_stylesheet *nscss_create_inline_style(const uint8_t *data, size_t len,
+ const char *charset, const char *url, bool allow_quirks);
+
+css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
+ uint64_t media, const css_stylesheet *inline_style);
+
+css_computed_style *nscss_get_blank_style(nscss_select_ctx *ctx,
+ const css_computed_style *parent);
+
+
+css_error named_ancestor_node(void *pw, void *node,
+ const css_qname *qname, void **ancestor);
+
+css_error node_is_visited(void *pw, void *node, bool *match);
+
+#endif
diff --git a/content/handlers/css/utils.c b/content/handlers/css/utils.c
new file mode 100644
index 0000000..59ad412
--- /dev/null
+++ b/content/handlers/css/utils.c
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2004 James Bursa <james(a)netsurf-browser.org>
+ * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+#include <assert.h>
+
+#include "utils/nsoption.h"
+#include "utils/log.h"
+
+#include "utils.h"
+
+/** Screen DPI in fixed point units: defaults to 90, which RISC OS uses */
+css_fixed nscss_screen_dpi = F_90;
+
+/* exported interface documented in content/handlers/css/utils.h */
+css_fixed nscss_len2pt(css_fixed length, css_unit unit)
+{
+ /* Length must not be relative */
+ assert(unit != CSS_UNIT_EM && unit != CSS_UNIT_EX);
+
+ switch (unit) {
+ /* We assume the screen and any other output has the same dpi */
+ /* 1in = DPIpx => 1px = (72/DPI)pt */
+ case CSS_UNIT_PX: return FDIV(FMUL(length, F_72), nscss_screen_dpi);
+ /* 1in = 72pt */
+ case CSS_UNIT_IN: return FMUL(length, F_72);
+ /* 1in = 2.54cm => 1cm = (72/2.54)pt */
+ case CSS_UNIT_CM: return FMUL(length,
+ FDIV(F_72, FLTTOFIX(2.54)));
+ /* 1in = 25.4mm => 1mm = (72/25.4)pt */
+ case CSS_UNIT_MM: return FMUL(length,
+ FDIV(F_72, FLTTOFIX(25.4)));
+ case CSS_UNIT_PT: return length;
+ /* 1pc = 12pt */
+ case CSS_UNIT_PC: return FMUL(length, INTTOFIX(12));
+ default: break;
+ }
+
+ return 0;
+}
+
+
+/* exported interface documented in content/handlers/css/utils.h */
+css_fixed nscss_len2px(css_fixed length, css_unit unit,
+ const css_computed_style *style)
+{
+ /* We assume the screen and any other output has the same dpi */
+ css_fixed px_per_unit;
+
+ assert(style != NULL || (unit != CSS_UNIT_EM && unit != CSS_UNIT_EX));
+
+ switch (unit) {
+ case CSS_UNIT_EM:
+ case CSS_UNIT_EX:
+ {
+ css_fixed font_size = 0;
+ css_unit font_unit = CSS_UNIT_PT;
+
+ css_computed_font_size(style, &font_size, &font_unit);
+
+ /* Convert to points */
+ font_size = nscss_len2pt(font_size, font_unit);
+
+ /* Clamp to configured minimum */
+ if (font_size < FDIV(INTTOFIX(nsoption_int(font_min_size)), F_10)) {
+ font_size = FDIV(INTTOFIX(nsoption_int(font_min_size)), F_10);
+ }
+
+ /* Convert to pixels (manually, to maximise precision)
+ * 1in = 72pt => 1pt = (DPI/72)px */
+ px_per_unit = FDIV(FMUL(font_size, nscss_screen_dpi), F_72);
+
+ /* Scale ex units: we use a fixed ratio of 1ex = 0.6em */
+ if (unit == CSS_UNIT_EX)
+ px_per_unit = FMUL(px_per_unit, FLTTOFIX(0.6));
+ }
+ break;
+ case CSS_UNIT_PX:
+ px_per_unit = F_1;
+ break;
+ /* 1in = DPIpx */
+ case CSS_UNIT_IN:
+ px_per_unit = nscss_screen_dpi;
+ break;
+ /* 1in = 2.54cm => 1cm = (DPI/2.54)px */
+ case CSS_UNIT_CM:
+ px_per_unit = FDIV(nscss_screen_dpi, FLTTOFIX(2.54));
+ break;
+ /* 1in = 25.4mm => 1mm = (DPI/25.4)px */
+ case CSS_UNIT_MM:
+ px_per_unit = FDIV(nscss_screen_dpi, FLTTOFIX(25.4));
+ break;
+ /* 1in = 72pt => 1pt = (DPI/72)px */
+ case CSS_UNIT_PT:
+ px_per_unit = FDIV(nscss_screen_dpi, F_72);
+ break;
+ /* 1pc = 12pt => 1in = 6pc => 1pc = (DPI/6)px */
+ case CSS_UNIT_PC:
+ px_per_unit = FDIV(nscss_screen_dpi, INTTOFIX(6));
+ break;
+ default:
+ px_per_unit = 0;
+ break;
+ }
+
+ /* Ensure we round px_per_unit to the nearest whole number of pixels:
+ * the use of FIXTOINT() below will truncate. */
+ px_per_unit += F_0_5;
+
+ /* Calculate total number of pixels */
+ return FMUL(length, TRUNCATEFIX(px_per_unit));
+}
diff --git a/content/handlers/css/utils.h b/content/handlers/css/utils.h
new file mode 100644
index 0000000..58a5ea6
--- /dev/null
+++ b/content/handlers/css/utils.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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 NETSURF_CSS_UTILS_H_
+#define NETSURF_CSS_UTILS_H_
+
+#include <libcss/libcss.h>
+
+#include "netsurf/css.h"
+
+/** DPI of the screen, in fixed point units */
+extern css_fixed nscss_screen_dpi;
+
+/**
+ * Convert an absolute CSS length to points.
+ *
+ * \param[in] length Absolute CSS length.
+ * \param[in] unit Unit of the length.
+ * \return length in points
+ */
+css_fixed nscss_len2pt(css_fixed length, css_unit unit);
+
+/**
+ * Convert a CSS length to pixels.
+ *
+ * \param length Length to convert
+ * \param unit Corresponding unit
+ * \param style Computed style applying to length. May be NULL if unit is
+ * neither em nor ex
+ * \return length in pixels
+ */
+css_fixed nscss_len2px(css_fixed length, css_unit unit, const css_computed_style *style);
+
+#endif
diff --git a/content/handlers/image/Makefile b/content/handlers/image/Makefile
index 5851a1c..541cd2c 100644
--- a/content/handlers/image/Makefile
+++ b/content/handlers/image/Makefile
@@ -12,4 +12,4 @@ S_IMAGE_$(NETSURF_USE_NSSVG) += svg.c
S_IMAGE_$(NETSURF_USE_RSVG) += rsvg.c
S_IMAGE_$(NETSURF_USE_VIDEO) += video.c
-S_IMAGE := $(addprefix image/,$(S_IMAGE_YES))
+S_IMAGE := $(S_IMAGE_YES)
diff --git a/content/handlers/image/svg.c b/content/handlers/image/svg.c
index c91b006..3eff684 100644
--- a/content/handlers/image/svg.c
+++ b/content/handlers/image/svg.c
@@ -23,13 +23,13 @@
#include <assert.h>
#include <limits.h>
#include <string.h>
+#include <stdlib.h>
#include <svgtiny.h>
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/content_protected.h"
-#include "css/css.h"
#include "desktop/plotters.h"
#include "svg.h"
diff --git a/css/Makefile b/css/Makefile
deleted file mode 100644
index 127dbaa..0000000
--- a/css/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# CSS sources
-
-S_CSS := css.c dump.c internal.c hints.c select.c utils.c
-
-S_CSS := $(addprefix css/,$(S_CSS))
diff --git a/css/css.c b/css/css.c
deleted file mode 100644
index 66dc6d4..0000000
--- a/css/css.c
+++ /dev/null
@@ -1,847 +0,0 @@
-/*
- * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-#include <assert.h>
-#include <libwapcaplet/libwapcaplet.h>
-#include <dom/dom.h>
-
-#include "content/content_protected.h"
-#include "content/fetch.h"
-#include "content/hlcache.h"
-#include "desktop/system_colour.h"
-#include "utils/corestrings.h"
-#include "utils/utils.h"
-#include "utils/http.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-
-#include "css/css.h"
-#include "css/hints.h"
-#include "css/internal.h"
-
-/* Define to trace import fetches */
-#undef NSCSS_IMPORT_TRACE
-
-struct content_css_data;
-
-/**
- * Type of callback called when a CSS object has finished
- *
- * \param css CSS object that has completed
- * \param pw Client-specific data
- */
-typedef void (*nscss_done_callback)(struct content_css_data *css, void *pw);
-
-/**
- * CSS content data
- */
-struct content_css_data
-{
- css_stylesheet *sheet; /**< Stylesheet object */
- char *charset; /**< Character set of stylesheet */
- struct nscss_import *imports; /**< Array of imported sheets */
- uint32_t import_count; /**< Number of sheets imported */
- uint32_t next_to_register; /**< Index of next import to register */
- nscss_done_callback done; /**< Completion callback */
- void *pw; /**< Client data */
-};
-
-/**
- * CSS content data
- */
-typedef struct nscss_content
-{
- struct content base; /**< Underlying content object */
-
- struct content_css_data data; /**< CSS data */
-} nscss_content;
-
-/**
- * Context for import fetches
- */
-typedef struct {
- struct content_css_data *css; /**< Object containing import */
- uint32_t index; /**< Index into parent sheet's
- * imports array */
-} nscss_import_ctx;
-
-static bool nscss_process_data(struct content *c, const char *data,
- unsigned int size);
-static bool nscss_convert(struct content *c);
-static void nscss_destroy(struct content *c);
-static nserror nscss_clone(const struct content *old, struct content **newc);
-static bool nscss_matches_quirks(const struct content *c, bool quirks);
-static content_type nscss_content_type(void);
-
-static nserror nscss_create_css_data(struct content_css_data *c,
- const char *url, const char *charset, bool quirks,
- nscss_done_callback done, void *pw);
-static css_error nscss_process_css_data(struct content_css_data *c, const char *data,
- unsigned int size);
-static css_error nscss_convert_css_data(struct content_css_data *c);
-static void nscss_destroy_css_data(struct content_css_data *c);
-
-static void nscss_content_done(struct content_css_data *css, void *pw);
-static css_error nscss_handle_import(void *pw, css_stylesheet *parent,
- lwc_string *url, uint64_t media);
-static nserror nscss_import(hlcache_handle *handle,
- const hlcache_event *event, void *pw);
-static css_error nscss_import_complete(nscss_import_ctx *ctx);
-
-static css_error nscss_register_imports(struct content_css_data *c);
-static css_error nscss_register_import(struct content_css_data *c,
- const hlcache_handle *import);
-
-
-static css_stylesheet *blank_import;
-
-
-/**
- * Initialise a CSS content
- *
- * \param handler content handler
- * \param imime_type mime-type
- * \param params Content-Type parameters
- * \param llcache handle to content
- * \param fallback_charset The character set to fallback to.
- * \param quirks allow quirks
- * \param c Content to initialise
- * \return NSERROR_OK or error cod eon faliure
- */
-static nserror
-nscss_create(const content_handler *handler,
- lwc_string *imime_type,
- const http_parameter *params,
- llcache_handle *llcache,
- const char *fallback_charset,
- bool quirks,
- struct content **c)
-{
- nscss_content *result;
- const char *charset = NULL;
- const char *xnsbase = NULL;
- lwc_string *charset_value = NULL;
- union content_msg_data msg_data;
- nserror error;
-
- result = calloc(1, sizeof(nscss_content));
- if (result == NULL)
- return NSERROR_NOMEM;
-
- error = content__init(&result->base, handler, imime_type,
- params, llcache, fallback_charset, quirks);
- if (error != NSERROR_OK) {
- free(result);
- return error;
- }
-
- /* Find charset specified on HTTP layer, if any */
- error = http_parameter_list_find_item(params, corestring_lwc_charset,
- &charset_value);
- if (error != NSERROR_OK || lwc_string_length(charset_value) == 0) {
- /* No charset specified, use fallback, if any */
- /** \todo libcss will take this as gospel, which is wrong */
- charset = fallback_charset;
- } else {
- charset = lwc_string_data(charset_value);
- }
-
- /* Compute base URL for stylesheet */
- xnsbase = llcache_handle_get_header(llcache, "X-NS-Base");
- if (xnsbase == NULL) {
- xnsbase = nsurl_access(content_get_url(&result->base));
- }
-
- error = nscss_create_css_data(&result->data,
- xnsbase, charset, result->base.quirks,
- nscss_content_done, result);
- if (error != NSERROR_OK) {
- msg_data.error = messages_get("NoMemory");
- content_broadcast(&result->base, CONTENT_MSG_ERROR, msg_data);
- if (charset_value != NULL)
- lwc_string_unref(charset_value);
- free(result);
- return error;
- }
-
- if (charset_value != NULL)
- lwc_string_unref(charset_value);
-
- *c = (struct content *) result;
-
- return NSERROR_OK;
-}
-
-/**
- * Create a struct content_css_data, creating a stylesheet object
- *
- * \param c Struct to populate
- * \param url URL of stylesheet
- * \param charset Stylesheet charset
- * \param quirks Stylesheet quirks mode
- * \param done Callback to call when content has completed
- * \param pw Client data for \a done
- * \return NSERROR_OK on success, NSERROR_NOMEM on memory exhaustion
- */
-static nserror nscss_create_css_data(struct content_css_data *c,
- const char *url, const char *charset, bool quirks,
- nscss_done_callback done, void *pw)
-{
- css_error error;
- css_stylesheet_params params;
-
- c->pw = pw;
- c->done = done;
- c->next_to_register = (uint32_t) -1;
- c->import_count = 0;
- c->imports = NULL;
- if (charset != NULL)
- c->charset = strdup(charset);
- else
- c->charset = NULL;
-
- params.params_version = CSS_STYLESHEET_PARAMS_VERSION_1;
- params.level = CSS_LEVEL_DEFAULT;
- params.charset = charset;
- params.url = url;
- params.title = NULL;
- params.allow_quirks = quirks;
- params.inline_style = false;
- params.resolve = nscss_resolve_url;
- params.resolve_pw = NULL;
- params.import = nscss_handle_import;
- params.import_pw = c;
- params.color = ns_system_colour;
- params.color_pw = NULL;
- params.font = NULL;
- params.font_pw = NULL;
-
- error = css_stylesheet_create(¶ms, &c->sheet);
- if (error != CSS_OK) {
- return NSERROR_NOMEM;
- }
-
- return NSERROR_OK;
-}
-
-/**
- * Process CSS source data
- *
- * \param c Content structure
- * \param data Data to process
- * \param size Number of bytes to process
- * \return true on success, false on failure
- */
-bool nscss_process_data(struct content *c, const char *data, unsigned int size)
-{
- nscss_content *css = (nscss_content *) c;
- union content_msg_data msg_data;
- css_error error;
-
- error = nscss_process_css_data(&css->data, data, size);
- if (error != CSS_OK && error != CSS_NEEDDATA) {
- msg_data.error = "?";
- content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
- }
-
- return (error == CSS_OK || error == CSS_NEEDDATA);
-}
-
-/**
- * Process CSS data
- *
- * \param c CSS content object
- * \param data Data to process
- * \param size Number of bytes to process
- * \return CSS_OK on success, appropriate error otherwise
- */
-static css_error nscss_process_css_data(struct content_css_data *c,
- const char *data, unsigned int size)
-{
- return css_stylesheet_append_data(c->sheet,
- (const uint8_t *) data, size);
-}
-
-/**
- * Convert a CSS content ready for use
- *
- * \param c Content to convert
- * \return true on success, false on failure
- */
-bool nscss_convert(struct content *c)
-{
- nscss_content *css = (nscss_content *) c;
- union content_msg_data msg_data;
- css_error error;
-
- error = nscss_convert_css_data(&css->data);
- if (error != CSS_OK) {
- msg_data.error = "?";
- content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
- return false;
- }
-
- return true;
-}
-
-/**
- * Convert CSS data ready for use
- *
- * \param c CSS data to convert
- * \return CSS error
- */
-static css_error nscss_convert_css_data(struct content_css_data *c)
-{
- css_error error;
-
- error = css_stylesheet_data_done(c->sheet);
-
- /* Process pending imports */
- if (error == CSS_IMPORTS_PENDING) {
- /* We must not have registered any imports yet */
- assert(c->next_to_register == (uint32_t) -1);
-
- /* Start registering, until we find one that
- * hasn't finished fetching */
- c->next_to_register = 0;
- error = nscss_register_imports(c);
- } else if (error == CSS_OK) {
- /* No imports, and no errors, so complete conversion */
- c->done(c, c->pw);
- } else {
- const char *url;
-
- if (css_stylesheet_get_url(c->sheet, &url) == CSS_OK) {
- LOG("Failed converting %p %s (%d)", c, url, error);
- } else {
- LOG("Failed converting %p (%d)", c, error);
- }
- }
-
- return error;
-}
-
-/**
- * Clean up a CSS content
- *
- * \param c Content to clean up
- */
-void nscss_destroy(struct content *c)
-{
- nscss_content *css = (nscss_content *) c;
-
- nscss_destroy_css_data(&css->data);
-}
-
-/**
- * Clean up CSS data
- *
- * \param c CSS data to clean up
- */
-static void nscss_destroy_css_data(struct content_css_data *c)
-{
- uint32_t i;
-
- for (i = 0; i < c->import_count; i++) {
- if (c->imports[i].c != NULL) {
- hlcache_handle_release(c->imports[i].c);
- }
- c->imports[i].c = NULL;
- }
-
- free(c->imports);
-
- if (c->sheet != NULL) {
- css_stylesheet_destroy(c->sheet);
- c->sheet = NULL;
- }
-
- free(c->charset);
-}
-
-nserror nscss_clone(const struct content *old, struct content **newc)
-{
- const nscss_content *old_css = (const nscss_content *) old;
- nscss_content *new_css;
- const char *data;
- unsigned long size;
- nserror error;
-
- new_css = calloc(1, sizeof(nscss_content));
- if (new_css == NULL)
- return NSERROR_NOMEM;
-
- /* Clone content */
- error = content__clone(old, &new_css->base);
- if (error != NSERROR_OK) {
- content_destroy(&new_css->base);
- return error;
- }
-
- /* Simply replay create/process/convert */
- error = nscss_create_css_data(&new_css->data,
- nsurl_access(content_get_url(&new_css->base)),
- old_css->data.charset,
- new_css->base.quirks,
- nscss_content_done, new_css);
- if (error != NSERROR_OK) {
- content_destroy(&new_css->base);
- return error;
- }
-
- data = content__get_source_data(&new_css->base, &size);
- if (size > 0) {
- if (nscss_process_data(&new_css->base, data, size) == false) {
- content_destroy(&new_css->base);
- return NSERROR_CLONE_FAILED;
- }
- }
-
- if (old->status == CONTENT_STATUS_READY ||
- old->status == CONTENT_STATUS_DONE) {
- if (nscss_convert(&new_css->base) == false) {
- content_destroy(&new_css->base);
- return NSERROR_CLONE_FAILED;
- }
- }
-
- *newc = (struct content *) new_css;
-
- return NSERROR_OK;
-}
-
-bool nscss_matches_quirks(const struct content *c, bool quirks)
-{
- return c->quirks == quirks;
-}
-
-/**
- * Retrieve the stylesheet object associated with a CSS content
- *
- * \param h Stylesheet content
- * \return Pointer to stylesheet object
- */
-css_stylesheet *nscss_get_stylesheet(struct hlcache_handle *h)
-{
- nscss_content *c = (nscss_content *) hlcache_handle_get_content(h);
-
- assert(c != NULL);
-
- return c->data.sheet;
-}
-
-/**
- * Retrieve imported stylesheets
- *
- * \param h Stylesheet containing imports
- * \param n Pointer to location to receive number of imports
- * \return Pointer to array of imported stylesheets
- */
-struct nscss_import *nscss_get_imports(hlcache_handle *h, uint32_t *n)
-{
- nscss_content *c = (nscss_content *) hlcache_handle_get_content(h);
-
- assert(c != NULL);
- assert(n != NULL);
-
- *n = c->data.import_count;
-
- return c->data.imports;
-}
-
-/**
- * Compute the type of a content
- *
- * \return CONTENT_CSS
- */
-content_type nscss_content_type(void)
-{
- return CONTENT_CSS;
-}
-
-/*****************************************************************************
- * Object completion *
- *****************************************************************************/
-
-/**
- * Handle notification that a CSS object is done
- *
- * \param css CSS object
- * \param pw Private data
- */
-void nscss_content_done(struct content_css_data *css, void *pw)
-{
- union content_msg_data msg_data;
- struct content *c = pw;
- uint32_t i;
- size_t size;
- css_error error;
-
- /* Retrieve the size of this sheet */
- error = css_stylesheet_size(css->sheet, &size);
- if (error != CSS_OK) {
- msg_data.error = "?";
- content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
- content_set_error(c);
- return;
- }
- c->size += size;
-
- /* Add on the size of the imported sheets */
- for (i = 0; i < css->import_count; i++) {
- if (css->imports[i].c != NULL) {
- struct content *import = hlcache_handle_get_content(
- css->imports[i].c);
-
- if (import != NULL) {
- c->size += import->size;
- }
- }
- }
-
- /* Finally, catch the content's users up with reality */
- content_set_ready(c);
- content_set_done(c);
-}
-
-/*****************************************************************************
- * Import handling *
- *****************************************************************************/
-
-/**
- * Handle notification of the need for an imported stylesheet
- *
- * \param pw CSS object requesting the import
- * \param parent Stylesheet requesting the import
- * \param url URL of the imported sheet
- * \param media Applicable media for the imported sheet
- * \return CSS_OK on success, appropriate error otherwise
- */
-css_error nscss_handle_import(void *pw, css_stylesheet *parent,
- lwc_string *url, uint64_t media)
-{
- content_type accept = CONTENT_CSS;
- struct content_css_data *c = pw;
- nscss_import_ctx *ctx;
- hlcache_child_context child;
- struct nscss_import *imports;
- const char *referer;
- css_error error;
- nserror nerror;
-
- nsurl *ns_url;
- nsurl *ns_ref;
-
- assert(parent == c->sheet);
-
- error = css_stylesheet_get_url(c->sheet, &referer);
- if (error != CSS_OK) {
- return error;
- }
-
- ctx = malloc(sizeof(*ctx));
- if (ctx == NULL)
- return CSS_NOMEM;
-
- ctx->css = c;
- ctx->index = c->import_count;
-
- /* Increase space in table */
- imports = realloc(c->imports, (c->import_count + 1) *
- sizeof(struct nscss_import));
- if (imports == NULL) {
- free(ctx);
- return CSS_NOMEM;
- }
- c->imports = imports;
-
- /** \todo fallback charset */
- child.charset = NULL;
- error = css_stylesheet_quirks_allowed(c->sheet, &child.quirks);
- if (error != CSS_OK) {
- free(ctx);
- return error;
- }
-
- /* Create content */
- c->imports[c->import_count].media = media;
-
- /** \todo Why aren't we getting a relative url part, to join? */
- nerror = nsurl_create(lwc_string_data(url), &ns_url);
- if (nerror != NSERROR_OK) {
- free(ctx);
- return CSS_NOMEM;
- }
-
- /** \todo Constructing nsurl for referer here is silly, avoid */
- nerror = nsurl_create(referer, &ns_ref);
- if (nerror != NSERROR_OK) {
- nsurl_unref(ns_url);
- free(ctx);
- return CSS_NOMEM;
- }
-
- /* Avoid importing ourself */
- if (nsurl_compare(ns_url, ns_ref, NSURL_COMPLETE)) {
- c->imports[c->import_count].c = NULL;
- /* No longer require context as we're not fetching anything */
- free(ctx);
- ctx = NULL;
- } else {
- nerror = hlcache_handle_retrieve(ns_url,
- 0, ns_ref, NULL, nscss_import, ctx,
- &child, accept,
- &c->imports[c->import_count].c);
- if (nerror != NSERROR_OK) {
- free(ctx);
- return CSS_NOMEM;
- }
- }
-
- nsurl_unref(ns_url);
- nsurl_unref(ns_ref);
-
-#ifdef NSCSS_IMPORT_TRACE
- LOG("Import %d '%s' -> (handle: %p ctx: %p)", c->import_count, lwc_string_data(url), c->imports[c->import_count].c, ctx);
-#endif
-
- c->import_count++;
-
- return CSS_OK;
-}
-
-/**
- * Handler for imported stylesheet events
- *
- * \param handle Handle for stylesheet
- * \param event Event object
- * \param pw Callback context
- * \return NSERROR_OK on success, appropriate error otherwise
- */
-nserror nscss_import(hlcache_handle *handle,
- const hlcache_event *event, void *pw)
-{
- nscss_import_ctx *ctx = pw;
- css_error error = CSS_OK;
-
-#ifdef NSCSS_IMPORT_TRACE
- LOG("Event %d for %p (%p)", event->type, handle, ctx);
-#endif
-
- assert(ctx->css->imports[ctx->index].c == handle);
-
- switch (event->type) {
- case CONTENT_MSG_DONE:
- error = nscss_import_complete(ctx);
- break;
-
- case CONTENT_MSG_ERROR:
- hlcache_handle_release(handle);
- ctx->css->imports[ctx->index].c = NULL;
-
- error = nscss_import_complete(ctx);
- /* Already released handle */
- break;
-
- default:
- break;
- }
-
- /* Preserve out-of-memory. Anything else is OK */
- return error == CSS_NOMEM ? NSERROR_NOMEM : NSERROR_OK;
-}
-
-/**
- * Handle an imported stylesheet completing
- *
- * \param ctx Import context
- * \return CSS_OK on success, appropriate error otherwise
- */
-css_error nscss_import_complete(nscss_import_ctx *ctx)
-{
- css_error error = CSS_OK;
-
- /* If this import is the next to be registered, do so */
- if (ctx->css->next_to_register == ctx->index)
- error = nscss_register_imports(ctx->css);
-
-#ifdef NSCSS_IMPORT_TRACE
- LOG("Destroying import context %p for %d", ctx, ctx->index);
-#endif
-
- /* No longer need import context */
- free(ctx);
-
- return error;
-}
-
-/*****************************************************************************
- * Import registration *
- *****************************************************************************/
-
-/**
- * Register imports with a stylesheet
- *
- * \param c CSS object containing the imports
- * \return CSS_OK on success, appropriate error otherwise
- */
-css_error nscss_register_imports(struct content_css_data *c)
-{
- uint32_t index;
- css_error error;
-
- assert(c->next_to_register != (uint32_t) -1);
- assert(c->next_to_register < c->import_count);
-
- /* Register imported sheets */
- for (index = c->next_to_register; index < c->import_count; index++) {
- /* Stop registering if we encounter one whose fetch hasn't
- * completed yet. We'll resume at this point when it has
- * completed.
- */
- if (c->imports[index].c != NULL &&
- content_get_status(c->imports[index].c) !=
- CONTENT_STATUS_DONE) {
- break;
- }
-
- error = nscss_register_import(c, c->imports[index].c);
- if (error != CSS_OK)
- return error;
- }
-
- /* Record identity of the next import to register */
- c->next_to_register = (uint32_t) index;
-
- if (c->next_to_register == c->import_count) {
- /* No more imports: notify parent that we're DONE */
- c->done(c, c->pw);
- }
-
- return CSS_OK;
-}
-
-
-/**
- * Register an import with a stylesheet
- *
- * \param c CSS object that requested the import
- * \param import Cache handle of import, or NULL for blank
- * \return CSS_OK on success, appropriate error otherwise
- */
-css_error nscss_register_import(struct content_css_data *c,
- const hlcache_handle *import)
-{
- css_stylesheet *sheet;
- css_error error;
-
- if (import != NULL) {
- nscss_content *s =
- (nscss_content *) hlcache_handle_get_content(import);
- sheet = s->data.sheet;
- } else {
- /* Create a blank sheet if needed. */
- if (blank_import == NULL) {
- css_stylesheet_params params;
-
- params.params_version = CSS_STYLESHEET_PARAMS_VERSION_1;
- params.level = CSS_LEVEL_DEFAULT;
- params.charset = NULL;
- params.url = "";
- params.title = NULL;
- params.allow_quirks = false;
- params.inline_style = false;
- params.resolve = nscss_resolve_url;
- params.resolve_pw = NULL;
- params.import = NULL;
- params.import_pw = NULL;
- params.color = ns_system_colour;
- params.color_pw = NULL;
- params.font = NULL;
- params.font_pw = NULL;
-
- error = css_stylesheet_create(¶ms, &blank_import);
- if (error != CSS_OK) {
- return error;
- }
-
- error = css_stylesheet_data_done(blank_import);
- if (error != CSS_OK) {
- css_stylesheet_destroy(blank_import);
- return error;
- }
- }
-
- sheet = blank_import;
- }
-
- error = css_stylesheet_register_import(c->sheet, sheet);
- if (error != CSS_OK) {
- return error;
- }
-
- return error;
-}
-
-/**
- * Clean up after the CSS content handler
- */
-static void nscss_fini(void)
-{
- if (blank_import != NULL) {
- css_stylesheet_destroy(blank_import);
- blank_import = NULL;
- }
- css_hint_fini();
-}
-
-static const content_handler css_content_handler = {
- .fini = nscss_fini,
- .create = nscss_create,
- .process_data = nscss_process_data,
- .data_complete = nscss_convert,
- .destroy = nscss_destroy,
- .clone = nscss_clone,
- .matches_quirks = nscss_matches_quirks,
- .type = nscss_content_type,
- .no_share = false,
-};
-
-/**
- * Initialise the CSS content handler
- */
-nserror nscss_init(void)
-{
- nserror error;
-
- error = content_factory_register_handler("text/css",
- &css_content_handler);
- if (error != NSERROR_OK)
- goto error;
-
- error = css_hint_init();
- if (error != NSERROR_OK)
- goto error;
-
- return NSERROR_OK;
-
-error:
- nscss_fini();
-
- return error;
-}
diff --git a/css/css.h b/css/css.h
deleted file mode 100644
index be8d4bc..0000000
--- a/css/css.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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 netsurf_css_css_h_
-#define netsurf_css_css_h_
-
-#include <stdint.h>
-
-#include <libcss/libcss.h>
-
-#include "utils/errors.h"
-
-struct hlcache_handle;
-
-/**
- * Imported stylesheet record
- */
-struct nscss_import {
- struct hlcache_handle *c; /**< Content containing sheet */
- uint64_t media; /**< Media types that sheet applies to */
-};
-
-nserror nscss_init(void);
-
-css_stylesheet *nscss_get_stylesheet(struct hlcache_handle *h);
-struct nscss_import *nscss_get_imports(struct hlcache_handle *h, uint32_t *n);
-
-#endif
-
diff --git a/css/dump.c b/css/dump.c
deleted file mode 100644
index d3ebc94..0000000
--- a/css/dump.c
+++ /dev/null
@@ -1,1806 +0,0 @@
-/*
- * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-#include <stdio.h>
-
-#include "css/dump.h"
-
-static void dump_css_fixed(FILE *stream, css_fixed f);
-static void dump_css_number(FILE *stream, css_fixed val);
-static void dump_css_unit(FILE *stream, css_fixed val, css_unit unit);
-
-/**
- * Dump a computed style \a style to the give file handle \a stream.
- *
- * \param stream Stream to write to
- * \param style Computed style to dump
- */
-void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
-{
- uint8_t val;
- css_color color = 0;
- lwc_string *url = NULL;
- css_fixed len1 = 0, len2 = 0;
- css_unit unit1 = CSS_UNIT_PX, unit2 = CSS_UNIT_PX;
- css_computed_clip_rect rect = { 0, 0, 0, 0, CSS_UNIT_PX, CSS_UNIT_PX,
- CSS_UNIT_PX, CSS_UNIT_PX, true, true,
- true, true };
- const css_computed_content_item *content = NULL;
- const css_computed_counter *counter = NULL;
- lwc_string **string_list = NULL;
- int32_t zindex = 0;
-
- fprintf(stream, "{ ");
-
- /* background-attachment */
- val = css_computed_background_attachment(style);
- switch (val) {
- case CSS_BACKGROUND_ATTACHMENT_FIXED:
- fprintf(stream, "background-attachment: fixed ");
- break;
- case CSS_BACKGROUND_ATTACHMENT_SCROLL:
- fprintf(stream, "background-attachment: scroll ");
- break;
- default:
- break;
- }
-
- /* background-color */
- val = css_computed_background_color(style, &color);
- switch (val) {
- case CSS_BACKGROUND_COLOR_COLOR:
- fprintf(stream, "background-color: #%08x ", color);
- break;
- default:
- break;
- }
-
- /* background-image */
- val = css_computed_background_image(style, &url);
- if (val == CSS_BACKGROUND_IMAGE_IMAGE && url != NULL) {
- fprintf(stream, "background-image: url('%.*s') ",
- (int) lwc_string_length(url),
- lwc_string_data(url));
- } else if (val == CSS_BACKGROUND_IMAGE_NONE) {
- fprintf(stream, "background-image: none ");
- }
-
- /* background-position */
- val = css_computed_background_position(style, &len1, &unit1,
- &len2, &unit2);
- if (val == CSS_BACKGROUND_POSITION_SET) {
- fprintf(stream, "background-position: ");
- dump_css_unit(stream, len1, unit1);
- fprintf(stream, " ");
- dump_css_unit(stream, len2, unit2);
- fprintf(stream, " ");
- }
-
- /* background-repeat */
- val = css_computed_background_repeat(style);
- switch (val) {
- case CSS_BACKGROUND_REPEAT_REPEAT_X:
- fprintf(stream, "background-repeat: repeat-x ");
- break;
- case CSS_BACKGROUND_REPEAT_REPEAT_Y:
- fprintf(stream, "background-repeat: repeat-y ");
- break;
- case CSS_BACKGROUND_REPEAT_REPEAT:
- fprintf(stream, "background-repeat: repeat ");
- break;
- case CSS_BACKGROUND_REPEAT_NO_REPEAT:
- fprintf(stream, "background-repeat: no-repeat ");
- break;
- default:
- break;
- }
-
- /* border-collapse */
- val = css_computed_border_collapse(style);
- switch (val) {
- case CSS_BORDER_COLLAPSE_SEPARATE:
- fprintf(stream, "border-collapse: separate ");
- break;
- case CSS_BORDER_COLLAPSE_COLLAPSE:
- fprintf(stream, "border-collapse: collapse ");
- break;
- default:
-
- break;
- }
-
- /* border-spacing */
- val = css_computed_border_spacing(style, &len1, &unit1, &len2, &unit2);
- if (val == CSS_BORDER_SPACING_SET) {
- fprintf(stream, "border-spacing: ");
- dump_css_unit(stream, len1, unit1);
- fprintf(stream, " ");
- dump_css_unit(stream, len2, unit2);
- fprintf(stream, " ");
- }
-
- /* border-top-color */
- val = css_computed_border_top_color(style, &color);
- switch (val) {
- case CSS_BORDER_COLOR_COLOR:
- fprintf(stream, "border-top-color: #%08x ", color);
- break;
- default:
- break;
- }
-
- /* border-right-color */
- val = css_computed_border_right_color(style, &color);
- switch (val) {
- case CSS_BORDER_COLOR_COLOR:
- fprintf(stream, "border-right-color: #%08x ", color);
- break;
- default:
- break;
- }
-
- /* border-bottom-color */
- val = css_computed_border_bottom_color(style, &color);
- switch (val) {
- case CSS_BORDER_COLOR_COLOR:
- fprintf(stream, "border-bottom-color: #%08x ", color);
- break;
- default:
- break;
- }
-
- /* border-left-color */
- val = css_computed_border_left_color(style, &color);
- switch (val) {
- case CSS_BORDER_COLOR_COLOR:
- fprintf(stream, "border-left-color: #%08x ", color);
- break;
- default:
- break;
- }
-
- /* border-top-style */
- val = css_computed_border_top_style(style);
- switch (val) {
- case CSS_BORDER_STYLE_NONE:
- fprintf(stream, "border-top-style: none ");
- break;
- case CSS_BORDER_STYLE_HIDDEN:
- fprintf(stream, "border-top-style: hidden ");
- break;
- case CSS_BORDER_STYLE_DOTTED:
- fprintf(stream, "border-top-style: dotted ");
- break;
- case CSS_BORDER_STYLE_DASHED:
- fprintf(stream, "border-top-style: dashed ");
- break;
- case CSS_BORDER_STYLE_SOLID:
- fprintf(stream, "border-top-style: solid ");
- break;
- case CSS_BORDER_STYLE_DOUBLE:
- fprintf(stream, "border-top-style: double ");
- break;
- case CSS_BORDER_STYLE_GROOVE:
- fprintf(stream, "border-top-style: groove ");
- break;
- case CSS_BORDER_STYLE_RIDGE:
- fprintf(stream, "border-top-style: ridge ");
- break;
- case CSS_BORDER_STYLE_INSET:
- fprintf(stream, "border-top-style: inset ");
- break;
- case CSS_BORDER_STYLE_OUTSET:
- fprintf(stream, "border-top-style: outset ");
- break;
- default:
- break;
- }
-
- /* border-right-style */
- val = css_computed_border_right_style(style);
- switch (val) {
- case CSS_BORDER_STYLE_NONE:
- fprintf(stream, "border-right-style: none ");
- break;
- case CSS_BORDER_STYLE_HIDDEN:
- fprintf(stream, "border-right-style: hidden ");
- break;
- case CSS_BORDER_STYLE_DOTTED:
- fprintf(stream, "border-right-style: dotted ");
- break;
- case CSS_BORDER_STYLE_DASHED:
- fprintf(stream, "border-right-style: dashed ");
- break;
- case CSS_BORDER_STYLE_SOLID:
- fprintf(stream, "border-right-style: solid ");
- break;
- case CSS_BORDER_STYLE_DOUBLE:
- fprintf(stream, "border-right-style: double ");
- break;
- case CSS_BORDER_STYLE_GROOVE:
- fprintf(stream, "border-right-style: groove ");
- break;
- case CSS_BORDER_STYLE_RIDGE:
- fprintf(stream, "border-right-style: ridge ");
- break;
- case CSS_BORDER_STYLE_INSET:
- fprintf(stream, "border-right-style: inset ");
- break;
- case CSS_BORDER_STYLE_OUTSET:
- fprintf(stream, "border-right-style: outset ");
- break;
- default:
- break;
- }
-
- /* border-bottom-style */
- val = css_computed_border_bottom_style(style);
- switch (val) {
- case CSS_BORDER_STYLE_NONE:
- fprintf(stream, "border-bottom-style: none ");
- break;
- case CSS_BORDER_STYLE_HIDDEN:
- fprintf(stream, "border-bottom-style: hidden ");
- break;
- case CSS_BORDER_STYLE_DOTTED:
- fprintf(stream, "border-bottom-style: dotted ");
- break;
- case CSS_BORDER_STYLE_DASHED:
- fprintf(stream, "border-bottom-style: dashed ");
- break;
- case CSS_BORDER_STYLE_SOLID:
- fprintf(stream, "border-bottom-style: solid ");
- break;
- case CSS_BORDER_STYLE_DOUBLE:
- fprintf(stream, "border-bottom-style: double ");
- break;
- case CSS_BORDER_STYLE_GROOVE:
- fprintf(stream, "border-bottom-style: groove ");
- break;
- case CSS_BORDER_STYLE_RIDGE:
- fprintf(stream, "border-bottom-style: ridge ");
- break;
- case CSS_BORDER_STYLE_INSET:
- fprintf(stream, "border-bottom-style: inset ");
- break;
- case CSS_BORDER_STYLE_OUTSET:
- fprintf(stream, "border-bottom-style: outset ");
- break;
- default:
- break;
- }
-
- /* border-left-style */
- val = css_computed_border_left_style(style);
- switch (val) {
- case CSS_BORDER_STYLE_NONE:
- fprintf(stream, "border-left-style: none ");
- break;
- case CSS_BORDER_STYLE_HIDDEN:
- fprintf(stream, "border-left-style: hidden ");
- break;
- case CSS_BORDER_STYLE_DOTTED:
- fprintf(stream, "border-left-style: dotted ");
- break;
- case CSS_BORDER_STYLE_DASHED:
- fprintf(stream, "border-left-style: dashed ");
- break;
- case CSS_BORDER_STYLE_SOLID:
- fprintf(stream, "border-left-style: solid ");
- break;
- case CSS_BORDER_STYLE_DOUBLE:
- fprintf(stream, "border-left-style: double ");
- break;
- case CSS_BORDER_STYLE_GROOVE:
- fprintf(stream, "border-left-style: groove ");
- break;
- case CSS_BORDER_STYLE_RIDGE:
- fprintf(stream, "border-left-style: ridge ");
- break;
- case CSS_BORDER_STYLE_INSET:
- fprintf(stream, "border-left-style: inset ");
- break;
- case CSS_BORDER_STYLE_OUTSET:
- fprintf(stream, "border-left-style: outset ");
- break;
- default:
- break;
- }
-
- /* border-top-width */
- val = css_computed_border_top_width(style, &len1, &unit1);
- switch (val) {
- case CSS_BORDER_WIDTH_THIN:
- fprintf(stream, "border-top-width: thin ");
- break;
- case CSS_BORDER_WIDTH_MEDIUM:
- fprintf(stream, "border-top-width: medium ");
- break;
- case CSS_BORDER_WIDTH_THICK:
- fprintf(stream, "border-top-width: thick ");
- break;
- case CSS_BORDER_WIDTH_WIDTH:
- fprintf(stream, "border-top-width: ");
- dump_css_unit(stream, len1, unit1);
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* border-right-width */
- val = css_computed_border_right_width(style, &len1, &unit1);
- switch (val) {
- case CSS_BORDER_WIDTH_THIN:
- fprintf(stream, "border-right-width: thin ");
- break;
- case CSS_BORDER_WIDTH_MEDIUM:
- fprintf(stream, "border-right-width: medium ");
- break;
- case CSS_BORDER_WIDTH_THICK:
- fprintf(stream, "border-right-width: thick ");
- break;
- case CSS_BORDER_WIDTH_WIDTH:
- fprintf(stream, "border-right-width: ");
- dump_css_unit(stream, len1, unit1);
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* border-bottom-width */
- val = css_computed_border_bottom_width(style, &len1, &unit1);
- switch (val) {
- case CSS_BORDER_WIDTH_THIN:
- fprintf(stream, "border-bottom-width: thin ");
- break;
- case CSS_BORDER_WIDTH_MEDIUM:
- fprintf(stream, "border-bottom-width: medium ");
- break;
- case CSS_BORDER_WIDTH_THICK:
- fprintf(stream, "border-bottom-width: thick ");
- break;
- case CSS_BORDER_WIDTH_WIDTH:
- fprintf(stream, "border-bottom-width: ");
- dump_css_unit(stream, len1, unit1);
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* border-left-width */
- val = css_computed_border_left_width(style, &len1, &unit1);
- switch (val) {
- case CSS_BORDER_WIDTH_THIN:
- fprintf(stream, "border-left-width: thin ");
- break;
- case CSS_BORDER_WIDTH_MEDIUM:
- fprintf(stream, "border-left-width: medium ");
- break;
- case CSS_BORDER_WIDTH_THICK:
- fprintf(stream, "border-left-width: thick ");
- break;
- case CSS_BORDER_WIDTH_WIDTH:
- fprintf(stream, "border-left-width: ");
- dump_css_unit(stream, len1, unit1);
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* bottom */
- val = css_computed_bottom(style, &len1, &unit1);
- switch (val) {
- case CSS_BOTTOM_AUTO:
- fprintf(stream, "bottom: auto ");
- break;
- case CSS_BOTTOM_SET:
- fprintf(stream, "bottom: ");
- dump_css_unit(stream, len1, unit1);
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* caption-side */
- val = css_computed_caption_side(style);
- switch (val) {
- case CSS_CAPTION_SIDE_TOP:
- fprintf(stream, "caption_side: top ");
- break;
- case CSS_CAPTION_SIDE_BOTTOM:
- fprintf(stream, "caption_side: bottom ");
- break;
- default:
- break;
- }
-
- /* clear */
- val = css_computed_clear(style);
- switch (val) {
- case CSS_CLEAR_NONE:
- fprintf(stream, "clear: none ");
- break;
- case CSS_CLEAR_LEFT:
- fprintf(stream, "clear: left ");
- break;
- case CSS_CLEAR_RIGHT:
- fprintf(stream, "clear: right ");
- break;
- case CSS_CLEAR_BOTH:
- fprintf(stream, "clear: both ");
- break;
- default:
- break;
- }
-
- /* clip */
- val = css_computed_clip(style, &rect);
- switch (val) {
- case CSS_CLIP_AUTO:
- fprintf(stream, "clip: auto ");
- break;
- case CSS_CLIP_RECT:
- fprintf(stream, "clip: rect( ");
-
- if (rect.top_auto)
- fprintf(stream, "auto");
- else
- dump_css_unit(stream, rect.top, rect.tunit);
- fprintf(stream, ", ");
-
- if (rect.right_auto)
- fprintf(stream, "auto");
- else
- dump_css_unit(stream, rect.right, rect.runit);
- fprintf(stream, ", ");
-
- if (rect.bottom_auto)
- fprintf(stream, "auto");
- else
- dump_css_unit(stream, rect.bottom, rect.bunit);
- fprintf(stream, ", ");
-
- if (rect.left_auto)
- fprintf(stream, "auto");
- else
- dump_css_unit(stream, rect.left, rect.lunit);
- fprintf(stream, ") ");
- break;
- default:
- break;
- }
-
- /* color */
- val = css_computed_color(style, &color);
- if (val == CSS_COLOR_COLOR) {
- fprintf(stream, "color: #%08x ", color);
- }
-
- /* content */
- val = css_computed_content(style, &content);
- switch (val) {
- case CSS_CONTENT_NONE:
- fprintf(stream, "content: none ");
- break;
- case CSS_CONTENT_NORMAL:
- fprintf(stream, "content: normal ");
- break;
- case CSS_CONTENT_SET:
- fprintf(stream, "content:");
-
- while (content->type != CSS_COMPUTED_CONTENT_NONE) {
- fprintf(stream, " ");
-
- switch (content->type) {
- case CSS_COMPUTED_CONTENT_STRING:
- fprintf(stream, "\"%.*s\"",
- (int) lwc_string_length(
- content->data.string),
- lwc_string_data(
- content->data.string));
- break;
- case CSS_COMPUTED_CONTENT_URI:
- fprintf(stream, "uri(\"%.*s\")",
- (int) lwc_string_length(
- content->data.uri),
- lwc_string_data(
- content->data.uri));
- break;
- case CSS_COMPUTED_CONTENT_COUNTER:
- fprintf(stream, "counter(%.*s)",
- (int) lwc_string_length(
- content->data.counter.name),
- lwc_string_data(
- content->data.counter.name));
- break;
- case CSS_COMPUTED_CONTENT_COUNTERS:
- fprintf(stream, "counters(%.*s, \"%.*s\")",
- (int) lwc_string_length(
- content->data.counters.name),
- lwc_string_data(
- content->data.counters.name),
- (int) lwc_string_length(
- content->data.counters.sep),
- lwc_string_data(
- content->data.counters.sep));
- break;
- case CSS_COMPUTED_CONTENT_ATTR:
- fprintf(stream, "attr(%.*s)",
- (int) lwc_string_length(
- content->data.attr),
- lwc_string_data(
- content->data.attr));
- break;
- case CSS_COMPUTED_CONTENT_OPEN_QUOTE:
- fprintf(stream, "open-quote");
- break;
- case CSS_COMPUTED_CONTENT_CLOSE_QUOTE:
- fprintf(stream, "close-quote");
- break;
- case CSS_COMPUTED_CONTENT_NO_OPEN_QUOTE:
- fprintf(stream, "no-open-quote");
- break;
- case CSS_COMPUTED_CONTENT_NO_CLOSE_QUOTE:
- fprintf(stream, "no-close-quote");
- break;
- }
-
- content++;
- }
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* counter-increment */
- val = css_computed_counter_increment(style, &counter);
- if ((val == CSS_COUNTER_INCREMENT_NONE) || (counter == NULL)) {
- fprintf(stream, "counter-increment: none ");
- } else {
- fprintf(stream, "counter-increment:");
-
- while (counter->name != NULL) {
- fprintf(stream, " %.*s ",
- (int) lwc_string_length(counter->name),
- lwc_string_data(counter->name));
-
- dump_css_fixed(stream, counter->value);
-
- counter++;
- }
-
- fprintf(stream, " ");
- }
-
- /* counter-reset */
- val = css_computed_counter_reset(style, &counter);
- if ((val == CSS_COUNTER_RESET_NONE) || (counter == NULL)) {
- fprintf(stream, "counter-reset: none ");
- } else {
- fprintf(stream, "counter-reset:");
-
- while (counter->name != NULL) {
- fprintf(stream, " %.*s ",
- (int) lwc_string_length(counter->name),
- lwc_string_data(counter->name));
-
- dump_css_fixed(stream, counter->value);
-
- counter++;
- }
-
- fprintf(stream, " ");
- }
-
- /* cursor */
- val = css_computed_cursor(style, &string_list);
- fprintf(stream, "cursor:");
-
- if (string_list != NULL) {
- while (*string_list != NULL) {
- fprintf(stream, " url\"%.*s\")",
- (int) lwc_string_length(*string_list),
- lwc_string_data(*string_list));
-
- string_list++;
- }
- }
- switch (val) {
- case CSS_CURSOR_AUTO:
- fprintf(stream, " auto ");
- break;
- case CSS_CURSOR_CROSSHAIR:
- fprintf(stream, " crosshair ");
- break;
- case CSS_CURSOR_DEFAULT:
- fprintf(stream, " default ");
- break;
- case CSS_CURSOR_POINTER:
- fprintf(stream, " pointer ");
- break;
- case CSS_CURSOR_MOVE:
- fprintf(stream, " move ");
- break;
- case CSS_CURSOR_E_RESIZE:
- fprintf(stream, " e-resize ");
- break;
- case CSS_CURSOR_NE_RESIZE:
- fprintf(stream, " ne-resize ");
- break;
- case CSS_CURSOR_NW_RESIZE:
- fprintf(stream, " nw-resize ");
- break;
- case CSS_CURSOR_N_RESIZE:
- fprintf(stream, " n-resize ");
- break;
- case CSS_CURSOR_SE_RESIZE:
- fprintf(stream, " se-resize ");
- break;
- case CSS_CURSOR_SW_RESIZE:
- fprintf(stream, " sw-resize ");
- break;
- case CSS_CURSOR_S_RESIZE:
- fprintf(stream, " s-resize ");
- break;
- case CSS_CURSOR_W_RESIZE:
- fprintf(stream, " w-resize ");
- break;
- case CSS_CURSOR_TEXT:
- fprintf(stream, " text ");
- break;
- case CSS_CURSOR_WAIT:
- fprintf(stream, " wait ");
- break;
- case CSS_CURSOR_HELP:
- fprintf(stream, " help ");
- break;
- case CSS_CURSOR_PROGRESS:
- fprintf(stream, " progress ");
- break;
- default:
- break;
- }
-
- /* direction */
- val = css_computed_direction(style);
- switch (val) {
- case CSS_DIRECTION_LTR:
- fprintf(stream, "direction: ltr ");
- break;
- case CSS_DIRECTION_RTL:
- fprintf(stream, "direction: rtl ");
- break;
- default:
- break;
- }
-
- /* display */
- val = css_computed_display_static(style);
- switch (val) {
- case CSS_DISPLAY_INLINE:
- fprintf(stream, "display: inline ");
- break;
- case CSS_DISPLAY_BLOCK:
- fprintf(stream, "display: block ");
- break;
- case CSS_DISPLAY_LIST_ITEM:
- fprintf(stream, "display: list-item ");
- break;
- case CSS_DISPLAY_RUN_IN:
- fprintf(stream, "display: run-in ");
- break;
- case CSS_DISPLAY_INLINE_BLOCK:
- fprintf(stream, "display: inline-block ");
- break;
- case CSS_DISPLAY_TABLE:
- fprintf(stream, "display: table ");
- break;
- case CSS_DISPLAY_INLINE_TABLE:
- fprintf(stream, "display: inline-table ");
- break;
- case CSS_DISPLAY_TABLE_ROW_GROUP:
- fprintf(stream, "display: table-row-group ");
- break;
- case CSS_DISPLAY_TABLE_HEADER_GROUP:
- fprintf(stream, "display: table-header-group ");
- break;
- case CSS_DISPLAY_TABLE_FOOTER_GROUP:
- fprintf(stream, "display: table-footer-group ");
- break;
- case CSS_DISPLAY_TABLE_ROW:
- fprintf(stream, "display: table-row ");
- break;
- case CSS_DISPLAY_TABLE_COLUMN_GROUP:
- fprintf(stream, "display: table-column-group ");
- break;
- case CSS_DISPLAY_TABLE_COLUMN:
- fprintf(stream, "display: table-column ");
- break;
- case CSS_DISPLAY_TABLE_CELL:
- fprintf(stream, "display: table-cell ");
- break;
- case CSS_DISPLAY_TABLE_CAPTION:
- fprintf(stream, "display: table-caption ");
- break;
- case CSS_DISPLAY_NONE:
- fprintf(stream, "display: none ");
- break;
- default:
- break;
- }
-
- /* empty-cells */
- val = css_computed_empty_cells(style);
- switch (val) {
- case CSS_EMPTY_CELLS_SHOW:
- fprintf(stream, "empty-cells: show ");
- break;
- case CSS_EMPTY_CELLS_HIDE:
- fprintf(stream, "empty-cells: hide ");
- break;
- default:
- break;
- }
-
- /* float */
- val = css_computed_float(style);
- switch (val) {
- case CSS_FLOAT_LEFT:
- fprintf(stream, "float: left ");
- break;
- case CSS_FLOAT_RIGHT:
- fprintf(stream, "float: right ");
- break;
- case CSS_FLOAT_NONE:
- fprintf(stream, "float: none ");
- break;
- default:
- break;
- }
-
- /* font-family */
- val = css_computed_font_family(style, &string_list);
- if (val != CSS_FONT_FAMILY_INHERIT) {
- fprintf(stream, "font-family:");
-
- if (string_list != NULL) {
- while (*string_list != NULL) {
- fprintf(stream, " \"%.*s\"",
- (int) lwc_string_length(*string_list),
- lwc_string_data(*string_list));
-
- string_list++;
- }
- }
- switch (val) {
- case CSS_FONT_FAMILY_SERIF:
- fprintf(stream, " serif ");
- break;
- case CSS_FONT_FAMILY_SANS_SERIF:
- fprintf(stream, " sans-serif ");
- break;
- case CSS_FONT_FAMILY_CURSIVE:
- fprintf(stream, " cursive ");
- break;
- case CSS_FONT_FAMILY_FANTASY:
- fprintf(stream, " fantasy ");
- break;
- case CSS_FONT_FAMILY_MONOSPACE:
- fprintf(stream, " monospace ");
- break;
- }
- }
-
- /* font-size */
- val = css_computed_font_size(style, &len1, &unit1);
- switch (val) {
- case CSS_FONT_SIZE_XX_SMALL:
- fprintf(stream, "font-size: xx-small ");
- break;
- case CSS_FONT_SIZE_X_SMALL:
- fprintf(stream, "font-size: x-small ");
- break;
- case CSS_FONT_SIZE_SMALL:
- fprintf(stream, "font-size: small ");
- break;
- case CSS_FONT_SIZE_MEDIUM:
- fprintf(stream, "font-size: medium ");
- break;
- case CSS_FONT_SIZE_LARGE:
- fprintf(stream, "font-size: large ");
- break;
- case CSS_FONT_SIZE_X_LARGE:
- fprintf(stream, "font-size: x-large ");
- break;
- case CSS_FONT_SIZE_XX_LARGE:
- fprintf(stream, "font-size: xx-large ");
- break;
- case CSS_FONT_SIZE_LARGER:
- fprintf(stream, "font-size: larger ");
- break;
- case CSS_FONT_SIZE_SMALLER:
- fprintf(stream, "font-size: smaller ");
- break;
- case CSS_FONT_SIZE_DIMENSION:
- fprintf(stream, "font-size: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* font-style */
- val = css_computed_font_style(style);
- switch (val) {
- case CSS_FONT_STYLE_NORMAL:
- fprintf(stream, "font-style: normal ");
- break;
- case CSS_FONT_STYLE_ITALIC:
- fprintf(stream, "font-style: italic ");
- break;
- case CSS_FONT_STYLE_OBLIQUE:
- fprintf(stream, "font-style: oblique ");
- break;
- default:
- break;
- }
-
- /* font-variant */
- val = css_computed_font_variant(style);
- switch (val) {
- case CSS_FONT_VARIANT_NORMAL:
- fprintf(stream, "font-variant: normal ");
- break;
- case CSS_FONT_VARIANT_SMALL_CAPS:
- fprintf(stream, "font-variant: small-caps ");
- break;
- default:
- break;
- }
-
- /* font-weight */
- val = css_computed_font_weight(style);
- switch (val) {
- case CSS_FONT_WEIGHT_NORMAL:
- fprintf(stream, "font-weight: normal ");
- break;
- case CSS_FONT_WEIGHT_BOLD:
- fprintf(stream, "font-weight: bold ");
- break;
- case CSS_FONT_WEIGHT_BOLDER:
- fprintf(stream, "font-weight: bolder ");
- break;
- case CSS_FONT_WEIGHT_LIGHTER:
- fprintf(stream, "font-weight: lighter ");
- break;
- case CSS_FONT_WEIGHT_100:
- fprintf(stream, "font-weight: 100 ");
- break;
- case CSS_FONT_WEIGHT_200:
- fprintf(stream, "font-weight: 200 ");
- break;
- case CSS_FONT_WEIGHT_300:
- fprintf(stream, "font-weight: 300 ");
- break;
- case CSS_FONT_WEIGHT_400:
- fprintf(stream, "font-weight: 400 ");
- break;
- case CSS_FONT_WEIGHT_500:
- fprintf(stream, "font-weight: 500 ");
- break;
- case CSS_FONT_WEIGHT_600:
- fprintf(stream, "font-weight: 600 ");
- break;
- case CSS_FONT_WEIGHT_700:
- fprintf(stream, "font-weight: 700 ");
- break;
- case CSS_FONT_WEIGHT_800:
- fprintf(stream, "font-weight: 800 ");
- break;
- case CSS_FONT_WEIGHT_900:
- fprintf(stream, "font-weight: 900 ");
- break;
- default:
- break;
- }
-
- /* height */
- val = css_computed_height(style, &len1, &unit1);
- switch (val) {
- case CSS_HEIGHT_AUTO:
- fprintf(stream, "height: auto ");
- break;
- case CSS_HEIGHT_SET:
- fprintf(stream, "height: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* left */
- val = css_computed_left(style, &len1, &unit1);
- switch (val) {
- case CSS_LEFT_AUTO:
- fprintf(stream, "left: auto ");
- break;
- case CSS_LEFT_SET:
- fprintf(stream, "left: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* letter-spacing */
- val = css_computed_letter_spacing(style, &len1, &unit1);
- switch (val) {
- case CSS_LETTER_SPACING_NORMAL:
- fprintf(stream, "letter-spacing: normal ");
- break;
- case CSS_LETTER_SPACING_SET:
- fprintf(stream, "letter-spacing: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* line-height */
- val = css_computed_line_height(style, &len1, &unit1);
- switch (val) {
- case CSS_LINE_HEIGHT_NORMAL:
- fprintf(stream, "line-height: normal ");
- break;
- case CSS_LINE_HEIGHT_NUMBER:
- fprintf(stream, "line-height: ");
-
- dump_css_fixed(stream, len1);
-
- fprintf(stream, " ");
- break;
- case CSS_LINE_HEIGHT_DIMENSION:
- fprintf(stream, "line-height: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* list-style-image */
- val = css_computed_list_style_image(style, &url);
- if (url != NULL) {
- fprintf(stream, "list-style-image: url('%.*s') ",
- (int) lwc_string_length(url),
- lwc_string_data(url));
- } else if (val == CSS_LIST_STYLE_IMAGE_NONE) {
- fprintf(stream, "list-style-image: none ");
- }
-
- /* list-style-position */
- val = css_computed_list_style_position(style);
- switch (val) {
- case CSS_LIST_STYLE_POSITION_INSIDE:
- fprintf(stream, "list-style-position: inside ");
- break;
- case CSS_LIST_STYLE_POSITION_OUTSIDE:
- fprintf(stream, "list-style-position: outside ");
- break;
- default:
- break;
- }
-
- /* list-style-type */
- val = css_computed_list_style_type(style);
- switch (val) {
- case CSS_LIST_STYLE_TYPE_DISC:
- fprintf(stream, "list-style-type: disc ");
- break;
- case CSS_LIST_STYLE_TYPE_CIRCLE:
- fprintf(stream, "list-style-type: circle ");
- break;
- case CSS_LIST_STYLE_TYPE_SQUARE:
- fprintf(stream, "list-style-type: square ");
- break;
- case CSS_LIST_STYLE_TYPE_DECIMAL:
- fprintf(stream, "list-style-type: decimal ");
- break;
- case CSS_LIST_STYLE_TYPE_DECIMAL_LEADING_ZERO:
- fprintf(stream, "list-style-type: decimal-leading-zero ");
- break;
- case CSS_LIST_STYLE_TYPE_LOWER_ROMAN:
- fprintf(stream, "list-style-type: lower-roman ");
- break;
- case CSS_LIST_STYLE_TYPE_UPPER_ROMAN:
- fprintf(stream, "list-style-type: upper-roman ");
- break;
- case CSS_LIST_STYLE_TYPE_LOWER_GREEK:
- fprintf(stream, "list-style-type: lower-greek ");
- break;
- case CSS_LIST_STYLE_TYPE_LOWER_LATIN:
- fprintf(stream, "list-style-type: lower-latin ");
- break;
- case CSS_LIST_STYLE_TYPE_UPPER_LATIN:
- fprintf(stream, "list-style-type: upper-latin ");
- break;
- case CSS_LIST_STYLE_TYPE_ARMENIAN:
- fprintf(stream, "list-style-type: armenian ");
- break;
- case CSS_LIST_STYLE_TYPE_GEORGIAN:
- fprintf(stream, "list-style-type: georgian ");
- break;
- case CSS_LIST_STYLE_TYPE_LOWER_ALPHA:
- fprintf(stream, "list-style-type: lower-alpha ");
- break;
- case CSS_LIST_STYLE_TYPE_UPPER_ALPHA:
- fprintf(stream, "list-style-type: upper-alpha ");
- break;
- case CSS_LIST_STYLE_TYPE_NONE:
- fprintf(stream, "list-style-type: none ");
- break;
- default:
- break;
- }
-
- /* margin-top */
- val = css_computed_margin_top(style, &len1, &unit1);
- switch (val) {
- case CSS_MARGIN_AUTO:
- fprintf(stream, "margin-top: auto ");
- break;
- case CSS_MARGIN_SET:
- fprintf(stream, "margin-top: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* margin-right */
- val = css_computed_margin_right(style, &len1, &unit1);
- switch (val) {
- case CSS_MARGIN_AUTO:
- fprintf(stream, "margin-right: auto ");
- break;
- case CSS_MARGIN_SET:
- fprintf(stream, "margin-right: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* margin-bottom */
- val = css_computed_margin_bottom(style, &len1, &unit1);
- switch (val) {
- case CSS_MARGIN_AUTO:
- fprintf(stream, "margin-bottom: auto ");
- break;
- case CSS_MARGIN_SET:
- fprintf(stream, "margin-bottom: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* margin-left */
- val = css_computed_margin_left(style, &len1, &unit1);
- switch (val) {
- case CSS_MARGIN_AUTO:
- fprintf(stream, "margin-left: auto ");
- break;
- case CSS_MARGIN_SET:
- fprintf(stream, "margin-left: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* max-height */
- val = css_computed_max_height(style, &len1, &unit1);
- switch (val) {
- case CSS_MAX_HEIGHT_NONE:
- fprintf(stream, "max-height: none ");
- break;
- case CSS_MAX_HEIGHT_SET:
- fprintf(stream, "max-height: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* max-width */
- val = css_computed_max_width(style, &len1, &unit1);
- switch (val) {
- case CSS_MAX_WIDTH_NONE:
- fprintf(stream, "max-width: none ");
- break;
- case CSS_MAX_WIDTH_SET:
- fprintf(stream, "max-width: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* min-height */
- val = css_computed_min_height(style, &len1, &unit1);
- switch (val) {
- case CSS_MIN_HEIGHT_SET:
- fprintf(stream, "min-height: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* min-width */
- val = css_computed_min_width(style, &len1, &unit1);
- switch (val) {
- case CSS_MIN_WIDTH_SET:
- fprintf(stream, "min-width: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* opacity */
- val = css_computed_opacity(style, &len1);
- switch (val) {
- case CSS_OPACITY_SET:
- fprintf(stream, "opacity: ");
-
- dump_css_fixed(stream, len1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* outline-color */
- val = css_computed_outline_color(style, &color);
- switch (val) {
- case CSS_OUTLINE_COLOR_INVERT:
- fprintf(stream, "outline-color: invert ");
- break;
- case CSS_OUTLINE_COLOR_COLOR:
- fprintf(stream, "outline-color: #%08x ", color);
- break;
- default:
- break;
- }
-
- /* outline-style */
- val = css_computed_outline_style(style);
- switch (val) {
- case CSS_OUTLINE_STYLE_NONE:
- fprintf(stream, "outline-style: none ");
- break;
- case CSS_OUTLINE_STYLE_DOTTED:
- fprintf(stream, "outline-style: dotted ");
- break;
- case CSS_OUTLINE_STYLE_DASHED:
- fprintf(stream, "outline-style: dashed ");
- break;
- case CSS_OUTLINE_STYLE_SOLID:
- fprintf(stream, "outline-style: solid ");
- break;
- case CSS_OUTLINE_STYLE_DOUBLE:
- fprintf(stream, "outline-style: double ");
- break;
- case CSS_OUTLINE_STYLE_GROOVE:
- fprintf(stream, "outline-style: groove ");
- break;
- case CSS_OUTLINE_STYLE_RIDGE:
- fprintf(stream, "outline-style: ridge ");
- break;
- case CSS_OUTLINE_STYLE_INSET:
- fprintf(stream, "outline-style: inset ");
- break;
- case CSS_OUTLINE_STYLE_OUTSET:
- fprintf(stream, "outline-style: outset ");
- break;
- default:
- break;
- }
-
- /* outline-width */
- val = css_computed_outline_width(style, &len1, &unit1);
- switch (val) {
- case CSS_OUTLINE_WIDTH_THIN:
- fprintf(stream, "outline-width: thin ");
- break;
- case CSS_OUTLINE_WIDTH_MEDIUM:
- fprintf(stream, "outline-width: medium ");
- break;
- case CSS_OUTLINE_WIDTH_THICK:
- fprintf(stream, "outline-width: thick ");
- break;
- case CSS_OUTLINE_WIDTH_WIDTH:
- fprintf(stream, "outline-width: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* overflow */
- val = css_computed_overflow_x(style);
- switch (val) {
- case CSS_OVERFLOW_VISIBLE:
- fprintf(stream, "overflow-x: visible ");
- break;
- case CSS_OVERFLOW_HIDDEN:
- fprintf(stream, "overflow-x: hidden ");
- break;
- case CSS_OVERFLOW_SCROLL:
- fprintf(stream, "overflow-x: scroll ");
- break;
- case CSS_OVERFLOW_AUTO:
- fprintf(stream, "overflow-x auto ");
- break;
- default:
- break;
- }
-
- /* overflow */
- val = css_computed_overflow_y(style);
- switch (val) {
- case CSS_OVERFLOW_VISIBLE:
- fprintf(stream, "overflow-y: visible ");
- break;
- case CSS_OVERFLOW_HIDDEN:
- fprintf(stream, "overflow-y: hidden ");
- break;
- case CSS_OVERFLOW_SCROLL:
- fprintf(stream, "overflow-y: scroll ");
- break;
- case CSS_OVERFLOW_AUTO:
- fprintf(stream, "overflow-y: auto ");
- break;
- default:
- break;
- }
-
- /* padding-top */
- val = css_computed_padding_top(style, &len1, &unit1);
- switch (val) {
- case CSS_PADDING_SET:
- fprintf(stream, "padding-top: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* padding-right */
- val = css_computed_padding_right(style, &len1, &unit1);
- switch (val) {
- case CSS_PADDING_SET:
- fprintf(stream, "padding-right: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* padding-bottom */
- val = css_computed_padding_bottom(style, &len1, &unit1);
- switch (val) {
- case CSS_PADDING_SET:
- fprintf(stream, "padding-bottom: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* padding-left */
- val = css_computed_padding_left(style, &len1, &unit1);
- switch (val) {
- case CSS_PADDING_SET:
- fprintf(stream, "padding-left: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* position */
- val = css_computed_position(style);
- switch (val) {
- case CSS_POSITION_STATIC:
- fprintf(stream, "position: static ");
- break;
- case CSS_POSITION_RELATIVE:
- fprintf(stream, "position: relative ");
- break;
- case CSS_POSITION_ABSOLUTE:
- fprintf(stream, "position: absolute ");
- break;
- case CSS_POSITION_FIXED:
- fprintf(stream, "position: fixed ");
- break;
- default:
- break;
- }
-
- /* quotes */
- val = css_computed_quotes(style, &string_list);
- if (val == CSS_QUOTES_STRING && string_list != NULL) {
- fprintf(stream, "quotes:");
-
- while (*string_list != NULL) {
- fprintf(stream, " \"%.*s\"",
- (int) lwc_string_length(*string_list),
- lwc_string_data(*string_list));
-
- string_list++;
- }
-
- fprintf(stream, " ");
- } else {
- switch (val) {
- case CSS_QUOTES_NONE:
- fprintf(stream, "quotes: none ");
- break;
- default:
- break;
- }
- }
-
- /* right */
- val = css_computed_right(style, &len1, &unit1);
- switch (val) {
- case CSS_RIGHT_AUTO:
- fprintf(stream, "right: auto ");
- break;
- case CSS_RIGHT_SET:
- fprintf(stream, "right: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* table-layout */
- val = css_computed_table_layout(style);
- switch (val) {
- case CSS_TABLE_LAYOUT_AUTO:
- fprintf(stream, "table-layout: auto ");
- break;
- case CSS_TABLE_LAYOUT_FIXED:
- fprintf(stream, "table-layout: fixed ");
- break;
- default:
- break;
- }
-
- /* text-align */
- val = css_computed_text_align(style);
- switch (val) {
- case CSS_TEXT_ALIGN_LEFT:
- fprintf(stream, "text-align: left ");
- break;
- case CSS_TEXT_ALIGN_RIGHT:
- fprintf(stream, "text-align: right ");
- break;
- case CSS_TEXT_ALIGN_CENTER:
- fprintf(stream, "text-align: center ");
- break;
- case CSS_TEXT_ALIGN_JUSTIFY:
- fprintf(stream, "text-align: justify ");
- break;
- case CSS_TEXT_ALIGN_DEFAULT:
- fprintf(stream, "text-align: default ");
- break;
- case CSS_TEXT_ALIGN_LIBCSS_LEFT:
- fprintf(stream, "text-align: -libcss-left ");
- break;
- case CSS_TEXT_ALIGN_LIBCSS_CENTER:
- fprintf(stream, "text-align: -libcss-center ");
- break;
- case CSS_TEXT_ALIGN_LIBCSS_RIGHT:
- fprintf(stream, "text-align: -libcss-right ");
- break;
- default:
- break;
- }
-
- /* text-decoration */
- val = css_computed_text_decoration(style);
- if (val == CSS_TEXT_DECORATION_NONE) {
- fprintf(stream, "text-decoration: none ");
- } else {
- fprintf(stream, "text-decoration:");
-
- if (val & CSS_TEXT_DECORATION_BLINK) {
- fprintf(stream, " blink");
- }
- if (val & CSS_TEXT_DECORATION_LINE_THROUGH) {
- fprintf(stream, " line-through");
- }
- if (val & CSS_TEXT_DECORATION_OVERLINE) {
- fprintf(stream, " overline");
- }
- if (val & CSS_TEXT_DECORATION_UNDERLINE) {
- fprintf(stream, " underline");
- }
-
- fprintf(stream, " ");
- }
-
- /* text-indent */
- val = css_computed_text_indent(style, &len1, &unit1);
- switch (val) {
- case CSS_TEXT_INDENT_SET:
- fprintf(stream, "text-indent: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* text-transform */
- val = css_computed_text_transform(style);
- switch (val) {
- case CSS_TEXT_TRANSFORM_CAPITALIZE:
- fprintf(stream, "text-transform: capitalize ");
- break;
- case CSS_TEXT_TRANSFORM_UPPERCASE:
- fprintf(stream, "text-transform: uppercase ");
- break;
- case CSS_TEXT_TRANSFORM_LOWERCASE:
- fprintf(stream, "text-transform: lowercase ");
- break;
- case CSS_TEXT_TRANSFORM_NONE:
- fprintf(stream, "text-transform: none ");
- break;
- default:
- break;
- }
-
- /* top */
- val = css_computed_top(style, &len1, &unit1);
- switch (val) {
- case CSS_TOP_AUTO:
- fprintf(stream, "top: auto ");
- break;
- case CSS_TOP_SET:
- fprintf(stream, "top: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* unicode-bidi */
- val = css_computed_unicode_bidi(style);
- switch (val) {
- case CSS_UNICODE_BIDI_NORMAL:
- fprintf(stream, "unicode-bidi: normal ");
- break;
- case CSS_UNICODE_BIDI_EMBED:
- fprintf(stream, "unicode-bidi: embed ");
- break;
- case CSS_UNICODE_BIDI_BIDI_OVERRIDE:
- fprintf(stream, "unicode-bidi: bidi-override ");
- break;
- default:
- break;
- }
-
- /* vertical-align */
- val = css_computed_vertical_align(style, &len1, &unit1);
- switch (val) {
- case CSS_VERTICAL_ALIGN_BASELINE:
- fprintf(stream, "vertical-align: baseline ");
- break;
- case CSS_VERTICAL_ALIGN_SUB:
- fprintf(stream, "vertical-align: sub ");
- break;
- case CSS_VERTICAL_ALIGN_SUPER:
- fprintf(stream, "vertical-align: super ");
- break;
- case CSS_VERTICAL_ALIGN_TOP:
- fprintf(stream, "vertical-align: top ");
- break;
- case CSS_VERTICAL_ALIGN_TEXT_TOP:
- fprintf(stream, "vertical-align: text-top ");
- break;
- case CSS_VERTICAL_ALIGN_MIDDLE:
- fprintf(stream, "vertical-align: middle ");
- break;
- case CSS_VERTICAL_ALIGN_BOTTOM:
- fprintf(stream, "vertical-align: bottom ");
- break;
- case CSS_VERTICAL_ALIGN_TEXT_BOTTOM:
- fprintf(stream, "vertical-align: text-bottom ");
- break;
- case CSS_VERTICAL_ALIGN_SET:
- fprintf(stream, "vertical-align: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* visibility */
- val = css_computed_visibility(style);
- switch (val) {
- case CSS_VISIBILITY_VISIBLE:
- fprintf(stream, "visibility: visible ");
- break;
- case CSS_VISIBILITY_HIDDEN:
- fprintf(stream, "visibility: hidden ");
- break;
- case CSS_VISIBILITY_COLLAPSE:
- fprintf(stream, "visibility: collapse ");
- break;
- default:
- break;
- }
-
- /* white-space */
- val = css_computed_white_space(style);
- switch (val) {
- case CSS_WHITE_SPACE_NORMAL:
- fprintf(stream, "white-space: normal ");
- break;
- case CSS_WHITE_SPACE_PRE:
- fprintf(stream, "white-space: pre ");
- break;
- case CSS_WHITE_SPACE_NOWRAP:
- fprintf(stream, "white-space: nowrap ");
- break;
- case CSS_WHITE_SPACE_PRE_WRAP:
- fprintf(stream, "white-space: pre-wrap ");
- break;
- case CSS_WHITE_SPACE_PRE_LINE:
- fprintf(stream, "white-space: pre-line ");
- break;
- default:
- break;
- }
-
- /* width */
- val = css_computed_width(style, &len1, &unit1);
- switch (val) {
- case CSS_WIDTH_AUTO:
- fprintf(stream, "width: auto ");
- break;
- case CSS_WIDTH_SET:
- fprintf(stream, "width: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* word-spacing */
- val = css_computed_word_spacing(style, &len1, &unit1);
- switch (val) {
- case CSS_WORD_SPACING_NORMAL:
- fprintf(stream, "word-spacing: normal ");
- break;
- case CSS_WORD_SPACING_SET:
- fprintf(stream, "word-spacing: ");
-
- dump_css_unit(stream, len1, unit1);
-
- fprintf(stream, " ");
- break;
- default:
- break;
- }
-
- /* z-index */
- val = css_computed_z_index(style, &zindex);
- switch (val) {
- case CSS_Z_INDEX_AUTO:
- fprintf(stream, "z-index: auto ");
- break;
- case CSS_Z_INDEX_SET:
- fprintf(stream, "z-index: %d ", zindex);
- break;
- default:
- break;
- }
-
- fprintf(stream, "}");
-}
-
-/******************************************************************************
- * Helper functions for nscss_dump_computed_style *
- ******************************************************************************/
-
-/**
- * Dump a fixed point value to the stream in a textual form.
- *
- * \param stream Stream to write to
- * \param f Value to write
- */
-void dump_css_fixed(FILE *stream, css_fixed f)
-{
-#define NSCSS_ABS(x) (uint32_t)((x) < 0 ? -(x) : (x))
- uint32_t uintpart = FIXTOINT(NSCSS_ABS(f));
- /* + 500 to ensure round to nearest (division will truncate) */
- uint32_t fracpart = ((NSCSS_ABS(f) & 0x3ff) * 1000 + 500) / (1 << 10);
-#undef NSCSS_ABS
-
- fprintf(stream, "%s%d.%03d", f < 0 ? "-" : "", uintpart, fracpart);
-}
-
-/**
- * Dump a numeric value to the stream in a textual form.
- *
- * \param stream Stream to write to
- * \param val Value to write
- */
-void dump_css_number(FILE *stream, css_fixed val)
-{
- if (INTTOFIX(FIXTOINT(val)) == val)
- fprintf(stream, "%d", FIXTOINT(val));
- else
- dump_css_fixed(stream, val);
-}
-
-/**
- * Dump a dimension to the stream in a textual form.
- *
- * \param stream Stream to write to
- * \param val Value to write
- * \param unit Unit to write
- */
-void dump_css_unit(FILE *stream, css_fixed val, css_unit unit)
-{
- dump_css_number(stream, val);
-
- switch (unit) {
- case CSS_UNIT_PX:
- fprintf(stream, "px");
- break;
- case CSS_UNIT_EX:
- fprintf(stream, "ex");
- break;
- case CSS_UNIT_EM:
- fprintf(stream, "em");
- break;
- case CSS_UNIT_IN:
- fprintf(stream, "in");
- break;
- case CSS_UNIT_CM:
- fprintf(stream, "cm");
- break;
- case CSS_UNIT_MM:
- fprintf(stream, "mm");
- break;
- case CSS_UNIT_PT:
- fprintf(stream, "pt");
- break;
- case CSS_UNIT_PC:
- fprintf(stream, "pc");
- break;
- case CSS_UNIT_PCT:
- fprintf(stream, "%%");
- break;
- case CSS_UNIT_DEG:
- fprintf(stream, "deg");
- break;
- case CSS_UNIT_GRAD:
- fprintf(stream, "grad");
- break;
- case CSS_UNIT_RAD:
- fprintf(stream, "rad");
- break;
- case CSS_UNIT_MS:
- fprintf(stream, "ms");
- break;
- case CSS_UNIT_S:
- fprintf(stream, "s");
- break;
- case CSS_UNIT_HZ:
- fprintf(stream, "Hz");
- break;
- case CSS_UNIT_KHZ:
- fprintf(stream, "kHz");
- break;
- }
-}
-
diff --git a/css/dump.h b/css/dump.h
deleted file mode 100644
index 25d283e..0000000
--- a/css/dump.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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 NETSURF_CSS_DUMP_H_
-#define NETSURF_CSS_DUMP_H_
-
-#include "css/css.h"
-
-void nscss_dump_computed_style(FILE *stream, const css_computed_style *style);
-
-#endif
diff --git a/css/hints.c b/css/hints.c
deleted file mode 100644
index 3561539..0000000
--- a/css/hints.c
+++ /dev/null
@@ -1,1611 +0,0 @@
-/*
- * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-#include <string.h>
-#include <strings.h>
-
-#include "utils/nsoption.h"
-#include "utils/corestrings.h"
-#include "utils/log.h"
-#include "utils/nsurl.h"
-#include "utils/utils.h"
-
-#include "css/hints.h"
-#include "css/select.h"
-
-#define LOG_STATS
-#undef LOG_STATS
-
-/******************************************************************************
- * Utility functions *
- ******************************************************************************/
-
-/**
- * Determine if a given character is whitespace
- *
- * \param c Character to consider
- * \return true if character is whitespace, false otherwise
- */
-static bool isWhitespace(char c)
-{
- return c == ' ' || c == '\t' || c == '\f' || c == '\r' || c == '\n';
-}
-
-/**
- * Determine if a given character is a valid hex digit
- *
- * \param c Character to consider
- * \return true if character is a valid hex digit, false otherwise
- */
-static bool isHex(char c)
-{
- return ('0' <= c && c <= '9') ||
- ('A' <= (c & ~0x20) && (c & ~0x20) <= 'F');
-}
-
-/**
- * Convert a character representing a hex digit to the corresponding hex value
- *
- * \param c Character to convert
- * \return Hex value represented by character
- *
- * \note This function assumes an ASCII-compatible character set
- */
-static uint8_t charToHex(char c)
-{
- /* 0-9 */
- c -= '0';
-
- /* A-F */
- if (c > 9)
- c -= 'A' - '9' - 1;
-
- /* a-f */
- if (c > 15)
- c -= 'a' - 'A';
-
- return c;
-}
-
-
-/******************************************************************************
- * Common parsing functions *
- ******************************************************************************/
-
-/**
- * Parse a number string
- *
- * \param data Data to parse (NUL-terminated)
- * \param maybe_negative Negative numbers permitted
- * \param real Floating point numbers permitted
- * \param value Pointer to location to receive numeric value
- * \param consumed Pointer to location to receive number of input
- * bytes consumed
- * \return true on success, false on invalid input
- */
-static bool parse_number(const char *data, bool maybe_negative, bool real,
- css_fixed *value, size_t *consumed)
-{
- size_t len;
- const uint8_t *ptr;
- int32_t intpart = 0;
- int32_t fracpart = 0;
- int32_t pwr = 1;
- int sign = 1;
-
- *consumed = 0;
-
- len = strlen(data);
- ptr = (const uint8_t *) data;
-
- if (len == 0)
- return false;
-
- /* Skip leading whitespace */
- while (len > 0 && isWhitespace(ptr[0])) {
- len--;
- ptr++;
- }
-
- if (len == 0)
- return false;
-
- /* Extract sign, if any */
- if (ptr[0] == '+') {
- len--;
- ptr++;
- } else if (ptr[0] == '-' && maybe_negative) {
- sign = -1;
- len--;
- ptr++;
- }
-
- if (len == 0)
- return false;
-
- /* Must have a digit [0,9] */
- if ('0' > ptr[0] || ptr[0] > '9')
- return false;
-
- /* Now extract intpart, assuming base 10 */
- while (len > 0) {
- /* Stop on first non-digit */
- if (ptr[0] < '0' || '9' < ptr[0])
- break;
-
- /* Prevent overflow of 'intpart'; proper clamping below */
- if (intpart < (1 << 22)) {
- intpart *= 10;
- intpart += ptr[0] - '0';
- }
- ptr++;
- len--;
- }
-
- /* And fracpart, again, assuming base 10 */
- if (real && len > 1 && ptr[0] == '.' &&
- ('0' <= ptr[1] && ptr[1] <= '9')) {
- ptr++;
- len--;
-
- while (len > 0) {
- if (ptr[0] < '0' || '9' < ptr[0])
- break;
-
- if (pwr < 1000000) {
- pwr *= 10;
- fracpart *= 10;
- fracpart += ptr[0] - '0';
- }
- ptr++;
- len--;
- }
-
- fracpart = ((1 << 10) * fracpart + pwr/2) / pwr;
- if (fracpart >= (1 << 10)) {
- intpart++;
- fracpart &= (1 << 10) - 1;
- }
- }
-
- if (sign > 0) {
- /* If the result is larger than we can represent,
- * then clamp to the maximum value we can store. */
- if (intpart >= (1 << 21)) {
- intpart = (1 << 21) - 1;
- fracpart = (1 << 10) - 1;
- }
- } else {
- /* If the negated result is smaller than we can represent
- * then clamp to the minimum value we can store. */
- if (intpart >= (1 << 21)) {
- intpart = -(1 << 21);
- fracpart = 0;
- } else {
- intpart = -intpart;
- if (fracpart) {
- fracpart = (1 << 10) - fracpart;
- intpart--;
- }
- }
- }
-
- *value = (intpart << 10) | fracpart;
-
- *consumed = ptr - (const uint8_t *) data;
-
- return true;
-}
-
-/**
- * Parse a dimension string
- *
- * \param data Data to parse (NUL-terminated)
- * \param strict Whether to enforce strict parsing rules
- * \param length Pointer to location to receive dimension's length
- * \param unit Pointer to location to receive dimension's unit
- * \return true on success, false on invalid input
- */
-static bool parse_dimension(const char *data, bool strict, css_fixed *length,
- css_unit *unit)
-{
- size_t len;
- size_t read;
- css_fixed value;
-
- len = strlen(data);
-
- if (parse_number(data, false, true, &value, &read) == false)
- return false;
-
- if (strict && value < INTTOFIX(1))
- return false;
-
- *length = value;
-
- if (len > read && data[read] == '%')
- *unit = CSS_UNIT_PCT;
- else
- *unit = CSS_UNIT_PX;
-
- return true;
-}
-
-/**
- * Mapping of colour name to CSS color
- */
-struct colour_map {
- const char *name;
- css_color color;
-};
-
-/**
- * Name comparator for named colour matching
- *
- * \param a Name to match
- * \param b Colour map entry to consider
- * \return 0 on match,
- * < 0 if a < b,
- * > 0 if b > a.
- */
-static int cmp_colour_name(const void *a, const void *b)
-{
- const char *aa = a;
- const struct colour_map *bb = b;
-
- return strcasecmp(aa, bb->name);
-}
-
-/**
- * Parse a named colour
- *
- * \param name Name to parse
- * \param result Pointer to location to receive css_color
- * \return true on success, false on invalid input
- */
-static bool parse_named_colour(const char *name, css_color *result)
-{
- static const struct colour_map named_colours[] = {
- { "aliceblue", 0xfff0f8ff },
- { "antiquewhite", 0xfffaebd7 },
- { "aqua", 0xff00ffff },
- { "aquamarine", 0xff7fffd4 },
- { "azure", 0xfff0ffff },
- { "beige", 0xfff5f5dc },
- { "bisque", 0xffffe4c4 },
- { "black", 0xff000000 },
- { "blanchedalmond", 0xffffebcd },
- { "blue", 0xff0000ff },
- { "blueviolet", 0xff8a2be2 },
- { "brown", 0xffa52a2a },
- { "burlywood", 0xffdeb887 },
- { "cadetblue", 0xff5f9ea0 },
- { "chartreuse", 0xff7fff00 },
- { "chocolate", 0xffd2691e },
- { "coral", 0xffff7f50 },
- { "cornflowerblue", 0xff6495ed },
- { "cornsilk", 0xfffff8dc },
- { "crimson", 0xffdc143c },
- { "cyan", 0xff00ffff },
- { "darkblue", 0xff00008b },
- { "darkcyan", 0xff008b8b },
- { "darkgoldenrod", 0xffb8860b },
- { "darkgray", 0xffa9a9a9 },
- { "darkgreen", 0xff006400 },
- { "darkgrey", 0xffa9a9a9 },
- { "darkkhaki", 0xffbdb76b },
- { "darkmagenta", 0xff8b008b },
- { "darkolivegreen", 0xff556b2f },
- { "darkorange", 0xffff8c00 },
- { "darkorchid", 0xff9932cc },
- { "darkred", 0xff8b0000 },
- { "darksalmon", 0xffe9967a },
- { "darkseagreen", 0xff8fbc8f },
- { "darkslateblue", 0xff483d8b },
- { "darkslategray", 0xff2f4f4f },
- { "darkslategrey", 0xff2f4f4f },
- { "darkturquoise", 0xff00ced1 },
- { "darkviolet", 0xff9400d3 },
- { "deeppink", 0xffff1493 },
- { "deepskyblue", 0xff00bfff },
- { "dimgray", 0xff696969 },
- { "dimgrey", 0xff696969 },
- { "dodgerblue", 0xff1e90ff },
- { "feldspar", 0xffd19275 },
- { "firebrick", 0xffb22222 },
- { "floralwhite", 0xfffffaf0 },
- { "forestgreen", 0xff228b22 },
- { "fuchsia", 0xffff00ff },
- { "gainsboro", 0xffdcdcdc },
- { "ghostwhite", 0xfff8f8ff },
- { "gold", 0xffffd700 },
- { "goldenrod", 0xffdaa520 },
- { "gray", 0xff808080 },
- { "green", 0xff008000 },
- { "greenyellow", 0xffadff2f },
- { "grey", 0xff808080 },
- { "honeydew", 0xfff0fff0 },
- { "hotpink", 0xffff69b4 },
- { "indianred", 0xffcd5c5c },
- { "indigo", 0xff4b0082 },
- { "ivory", 0xfffffff0 },
- { "khaki", 0xfff0e68c },
- { "lavender", 0xffe6e6fa },
- { "lavenderblush", 0xfffff0f5 },
- { "lawngreen", 0xff7cfc00 },
- { "lemonchiffon", 0xfffffacd },
- { "lightblue", 0xffadd8e6 },
- { "lightcoral", 0xfff08080 },
- { "lightcyan", 0xffe0ffff },
- { "lightgoldenrodyellow", 0xfffafad2 },
- { "lightgray", 0xffd3d3d3 },
- { "lightgreen", 0xff90ee90 },
- { "lightgrey", 0xffd3d3d3 },
- { "lightpink", 0xffffb6c1 },
- { "lightsalmon", 0xffffa07a },
- { "lightseagreen", 0xff20b2aa },
- { "lightskyblue", 0xff87cefa },
- { "lightslateblue", 0xff8470ff },
- { "lightslategray", 0xff778899 },
- { "lightslategrey", 0xff778899 },
- { "lightsteelblue", 0xffb0c4de },
- { "lightyellow", 0xffffffe0 },
- { "lime", 0xff00ff00 },
- { "limegreen", 0xff32cd32 },
- { "linen", 0xfffaf0e6 },
- { "magenta", 0xffff00ff },
- { "maroon", 0xff800000 },
- { "mediumaquamarine", 0xff66cdaa },
- { "mediumblue", 0xff0000cd },
- { "mediumorchid", 0xffba55d3 },
- { "mediumpurple", 0xff9370db },
- { "mediumseagreen", 0xff3cb371 },
- { "mediumslateblue", 0xff7b68ee },
- { "mediumspringgreen", 0xff00fa9a },
- { "mediumturquoise", 0xff48d1cc },
- { "mediumvioletred", 0xffc71585 },
- { "midnightblue", 0xff191970 },
- { "mintcream", 0xfff5fffa },
- { "mistyrose", 0xffffe4e1 },
- { "moccasin", 0xffffe4b5 },
- { "navajowhite", 0xffffdead },
- { "navy", 0xff000080 },
- { "oldlace", 0xfffdf5e6 },
- { "olive", 0xff808000 },
- { "olivedrab", 0xff6b8e23 },
- { "orange", 0xffffa500 },
- { "orangered", 0xffff4500 },
- { "orchid", 0xffda70d6 },
- { "palegoldenrod", 0xffeee8aa },
- { "palegreen", 0xff98fb98 },
- { "paleturquoise", 0xffafeeee },
- { "palevioletred", 0xffdb7093 },
- { "papayawhip", 0xffffefd5 },
- { "peachpuff", 0xffffdab9 },
- { "peru", 0xffcd853f },
- { "pink", 0xffffc0cb },
- { "plum", 0xffdda0dd },
- { "powderblue", 0xffb0e0e6 },
- { "purple", 0xff800080 },
- { "red", 0xffff0000 },
- { "rosybrown", 0xffbc8f8f },
- { "royalblue", 0xff4169e1 },
- { "saddlebrown", 0xff8b4513 },
- { "salmon", 0xfffa8072 },
- { "sandybrown", 0xfff4a460 },
- { "seagreen", 0xff2e8b57 },
- { "seashell", 0xfffff5ee },
- { "sienna", 0xffa0522d },
- { "silver", 0xffc0c0c0 },
- { "skyblue", 0xff87ceeb },
- { "slateblue", 0xff6a5acd },
- { "slategray", 0xff708090 },
- { "slategrey", 0xff708090 },
- { "snow", 0xfffffafa },
- { "springgreen", 0xff00ff7f },
- { "steelblue", 0xff4682b4 },
- { "tan", 0xffd2b48c },
- { "teal", 0xff008080 },
- { "thistle", 0xffd8bfd8 },
- { "tomato", 0xffff6347 },
- { "turquoise", 0xff40e0d0 },
- { "violet", 0xffee82ee },
- { "violetred", 0xffd02090 },
- { "wheat", 0xfff5deb3 },
- { "white", 0xffffffff },
- { "whitesmoke", 0xfff5f5f5 },
- { "yellow", 0xffffff00 },
- { "yellowgreen", 0xff9acd32 }
- };
- const struct colour_map *entry;
-
- entry = bsearch(name, named_colours,
- sizeof(named_colours) / sizeof(named_colours[0]),
- sizeof(named_colours[0]),
- cmp_colour_name);
-
- if (entry != NULL)
- *result = entry->color;
-
- return entry != NULL;
-}
-
-/**
- * Parser for colours specified in attribute values.
- *
- * \param data Data to parse (NUL-terminated)
- * \param result Pointer to location to receive resulting css_color
- * \return true on success, false on invalid input
- */
-bool nscss_parse_colour(const char *data, css_color *result)
-{
- size_t len = strlen(data);
- uint8_t r, g, b;
-
- /* 2 */
- if (len == 0)
- return false;
-
- /* 3 */
- if (len == SLEN("transparent") && strcasecmp(data, "transparent") == 0)
- return false;
-
- /* 4 */
- if (parse_named_colour(data, result))
- return true;
-
- /** \todo Implement HTML5's utterly insane legacy colour parsing */
-
- if (data[0] == '#') {
- data++;
- len--;
- }
-
- if (len == 3 && isHex(data[0]) && isHex(data[1]) && isHex(data[2])) {
- r = charToHex(data[0]);
- g = charToHex(data[1]);
- b = charToHex(data[2]);
-
- r |= (r << 4);
- g |= (g << 4);
- b |= (b << 4);
-
- *result = (0xff << 24) | (r << 16) | (g << 8) | b;
-
- return true;
- } else if (len == 6 && isHex(data[0]) && isHex(data[1]) &&
- isHex(data[2]) && isHex(data[3]) && isHex(data[4]) &&
- isHex(data[5])) {
- r = (charToHex(data[0]) << 4) | charToHex(data[1]);
- g = (charToHex(data[2]) << 4) | charToHex(data[3]);
- b = (charToHex(data[4]) << 4) | charToHex(data[5]);
-
- *result = (0xff << 24) | (r << 16) | (g << 8) | b;
-
- return true;
- }
-
- return false;
-}
-
-/**
- * Parse a font \@size attribute
- *
- * \param size Data to parse (NUL-terminated)
- * \param val Pointer to location to receive enum value
- * \param len Pointer to location to receive length
- * \param unit Pointer to location to receive unit
- * \return True on success, false on failure
- */
-static bool parse_font_size(const char *size, uint8_t *val,
- css_fixed *len, css_unit *unit)
-{
- static const uint8_t size_map[] = {
- CSS_FONT_SIZE_XX_SMALL,
- CSS_FONT_SIZE_SMALL,
- CSS_FONT_SIZE_MEDIUM,
- CSS_FONT_SIZE_LARGE,
- CSS_FONT_SIZE_X_LARGE,
- CSS_FONT_SIZE_XX_LARGE,
- CSS_FONT_SIZE_DIMENSION /* xxx-large (see below) */
- };
-
- const char *p = size;
- char mode;
- int value = 0;
-
- /* Skip whitespace */
- while (*p != '\0' && isWhitespace(*p))
- p++;
-
- mode = *p;
-
- /* Skip +/- */
- if (mode == '+' || mode == '-')
- p++;
-
- /* Need at least one digit */
- if (*p < '0' || *p > '9') {
- return false;
- }
-
- /* Consume digits, computing value */
- while ('0' <= *p && *p <= '9') {
- value = value * 10 + (*p - '0');
- p++;
- }
-
- /* Resolve relative sizes */
- if (mode == '+')
- value += 3;
- else if (mode == '-')
- value = 3 - value;
-
- /* Clamp to range [1,7] */
- if (value < 1)
- value = 1;
- else if (value > 7)
- value = 7;
-
- if (value == 7) {
- /* Manufacture xxx-large */
- *len = FDIV(FMUL(INTTOFIX(3), INTTOFIX(nsoption_int(font_size))),
- F_10);
- } else {
- /* Len is irrelevant */
- *len = 0;
- }
-
- *unit = CSS_UNIT_PT;
- *val = size_map[value - 1];
-
- return true;
-}
-
-
-/******************************************************************************
- * Hint context management *
- ******************************************************************************/
-
-#define MAX_HINTS_PER_ELEMENT 32
-
-struct css_hint_ctx {
- struct css_hint *hints;
- uint32_t len;
-};
-
-struct css_hint_ctx hint_ctx;
-
-nserror css_hint_init(void)
-{
- hint_ctx.hints = malloc(sizeof(struct css_hint) *
- MAX_HINTS_PER_ELEMENT);
- if (hint_ctx.hints == NULL) {
- return NSERROR_NOMEM;
- }
-
- return NSERROR_OK;
-}
-
-void css_hint_fini(void)
-{
- hint_ctx.len = 0;
- free(hint_ctx.hints);
-}
-
-static void css_hint_clean(void)
-{
- hint_ctx.len = 0;
-}
-
-static inline struct css_hint * css_hint_advance(struct css_hint *hint)
-{
- hint_ctx.len++;
- assert(hint_ctx.len < MAX_HINTS_PER_ELEMENT);
-
- return ++hint;
-}
-
-static void css_hint_get_hints(struct css_hint **hints, uint32_t *nhints)
-{
- *hints = hint_ctx.hints;
- *nhints = hint_ctx.len;
-}
-
-
-/******************************************************************************
- * Presentational hint handlers *
- ******************************************************************************/
-
-static void css_hint_table_cell_border_padding(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- css_qname qs;
- dom_string *attr = NULL;
- dom_node *tablenode = NULL;
- dom_exception exc;
-
- qs.ns = NULL;
- qs.name = lwc_string_ref(corestring_lwc_table);
- if (named_ancestor_node(ctx, node, &qs,
- (void *)&tablenode) != CSS_OK) {
- /* Didn't find, or had error */
- lwc_string_unref(qs.name);
- return;
- }
- lwc_string_unref(qs.name);
-
- if (tablenode == NULL) {
- return;
- }
- /* No need to unref tablenode, named_ancestor_node does not
- * return a reffed node to the CSS
- */
-
- exc = dom_element_get_attribute(tablenode,
- corestring_dom_border, &attr);
-
- if (exc == DOM_NO_ERR && attr != NULL) {
- uint32_t hint_prop;
- css_hint_length hint_length;
-
- if (parse_dimension(
- dom_string_data(attr), false,
- &hint_length.value,
- &hint_length.unit) &&
- INTTOFIX(0) != hint_length.value) {
-
- for (hint_prop = CSS_PROP_BORDER_TOP_STYLE;
- hint_prop <= CSS_PROP_BORDER_LEFT_STYLE;
- hint_prop++) {
- hint->prop = hint_prop;
- hint->status = CSS_BORDER_STYLE_INSET;
- hint = css_hint_advance(hint);
- }
-
- for (hint_prop = CSS_PROP_BORDER_TOP_WIDTH;
- hint_prop <= CSS_PROP_BORDER_LEFT_WIDTH;
- hint_prop++) {
- hint->prop = hint_prop;
- hint->data.length.value = INTTOFIX(1);
- hint->data.length.unit = CSS_UNIT_PX;
- hint->status = CSS_BORDER_WIDTH_WIDTH;
- hint = css_hint_advance(hint);
- }
- }
- dom_string_unref(attr);
- }
-
- exc = dom_element_get_attribute(tablenode,
- corestring_dom_bordercolor, &attr);
-
- if (exc == DOM_NO_ERR && attr != NULL) {
- uint32_t hint_prop;
- css_color hint_color;
-
- if (nscss_parse_colour(
- (const char *)dom_string_data(attr),
- &hint_color)) {
-
- for (hint_prop = CSS_PROP_BORDER_TOP_COLOR;
- hint_prop <= CSS_PROP_BORDER_LEFT_COLOR;
- hint_prop++) {
- hint->prop = hint_prop;
- hint->data.color = hint_color;
- hint->status = CSS_BORDER_COLOR_COLOR;
- hint = css_hint_advance(hint);
- }
- }
- dom_string_unref(attr);
- }
-
- exc = dom_element_get_attribute(tablenode,
- corestring_dom_cellpadding, &attr);
-
- if (exc == DOM_NO_ERR && attr != NULL) {
- uint32_t hint_prop;
- css_hint_length hint_length;
-
- if (parse_dimension(
- dom_string_data(attr), false,
- &hint_length.value,
- &hint_length.unit)) {
-
- for (hint_prop = CSS_PROP_PADDING_TOP;
- hint_prop <= CSS_PROP_PADDING_LEFT;
- hint_prop++) {
- hint->prop = hint_prop;
- hint->data.length.value = hint_length.value;
- hint->data.length.unit = hint_length.unit;
- hint->status = CSS_PADDING_SET;
- hint = css_hint_advance(hint);
- }
- }
- dom_string_unref(attr);
- }
-}
-
-static void css_hint_vertical_align_table_cells(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_string *attr = NULL;
- dom_exception err;
-
- err = dom_element_get_attribute(node,
- corestring_dom_valign, &attr);
-
- if (err == DOM_NO_ERR && attr != NULL) {
- if (dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_top)) {
- hint->prop = CSS_PROP_VERTICAL_ALIGN;
- hint->status = CSS_VERTICAL_ALIGN_TOP;
- hint = css_hint_advance(hint);
-
- } else if (dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_middle)) {
- hint->prop = CSS_PROP_VERTICAL_ALIGN;
- hint->status = CSS_VERTICAL_ALIGN_MIDDLE;
- hint = css_hint_advance(hint);
-
- } else if (dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_bottom)) {
- hint->prop = CSS_PROP_VERTICAL_ALIGN;
- hint->status = CSS_VERTICAL_ALIGN_BOTTOM;
- hint = css_hint_advance(hint);
-
- } else if (dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_baseline)) {
- hint->prop = CSS_PROP_VERTICAL_ALIGN;
- hint->status = CSS_VERTICAL_ALIGN_BASELINE;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(attr);
- }
-}
-
-static void css_hint_vertical_align_replaced(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_string *attr = NULL;
- dom_exception err;
-
- err = dom_element_get_attribute(node,
- corestring_dom_valign, &attr);
-
- if (err == DOM_NO_ERR && attr != NULL) {
- if (dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_top)) {
- hint->prop = CSS_PROP_VERTICAL_ALIGN;
- hint->status = CSS_VERTICAL_ALIGN_TOP;
- hint = css_hint_advance(hint);
-
- } else if (dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_bottom) ||
- dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_baseline)) {
- hint->prop = CSS_PROP_VERTICAL_ALIGN;
- hint->status = CSS_VERTICAL_ALIGN_BASELINE;
- hint = css_hint_advance(hint);
-
- } else if (dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_texttop)) {
- hint->prop = CSS_PROP_VERTICAL_ALIGN;
- hint->status = CSS_VERTICAL_ALIGN_TEXT_TOP;
- hint = css_hint_advance(hint);
-
- } else if (dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_absmiddle) ||
- dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_abscenter)) {
- hint->prop = CSS_PROP_VERTICAL_ALIGN;
- hint->status = CSS_VERTICAL_ALIGN_MIDDLE;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(attr);
- }
-}
-
-static void css_hint_text_align_normal(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_string *align = NULL;
- dom_exception err;
-
- err = dom_element_get_attribute(node,
- corestring_dom_align, &align);
- if (err == DOM_NO_ERR && align != NULL) {
- if (dom_string_caseless_lwc_isequal(align,
- corestring_lwc_left)) {
- hint->prop = CSS_PROP_TEXT_ALIGN;
- hint->status = CSS_TEXT_ALIGN_LEFT;
- hint = css_hint_advance(hint);
-
- } else if (dom_string_caseless_lwc_isequal(align,
- corestring_lwc_center)) {
- hint->prop = CSS_PROP_TEXT_ALIGN;
- hint->status = CSS_TEXT_ALIGN_CENTER;
- hint = css_hint_advance(hint);
-
- } else if (dom_string_caseless_lwc_isequal(align,
- corestring_lwc_right)) {
- hint->prop = CSS_PROP_TEXT_ALIGN;
- hint->status = CSS_TEXT_ALIGN_RIGHT;
- hint = css_hint_advance(hint);
-
- } else if (dom_string_caseless_lwc_isequal(align,
- corestring_lwc_justify)) {
- hint->prop = CSS_PROP_TEXT_ALIGN;
- hint->status = CSS_TEXT_ALIGN_JUSTIFY;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(align);
- }
-}
-
-static void css_hint_text_align_center(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
-
- hint->prop = CSS_PROP_TEXT_ALIGN;
- hint->status = CSS_TEXT_ALIGN_LIBCSS_CENTER;
- hint = css_hint_advance(hint);
-}
-
-static void css_hint_margin_left_right_align_center(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_string *attr;
- dom_exception exc;
-
- exc = dom_element_get_attribute(node,
- corestring_dom_align, &attr);
-
- if (exc == DOM_NO_ERR && attr != NULL) {
- if (dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_center) ||
- dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_abscenter) ||
- dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_middle) ||
- dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_absmiddle)) {
- hint->prop = CSS_PROP_MARGIN_LEFT;
- hint->status = CSS_MARGIN_AUTO;
- hint = css_hint_advance(hint);
-
- hint->prop = CSS_PROP_MARGIN_RIGHT;
- hint->status = CSS_MARGIN_AUTO;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(attr);
- }
-}
-
-static void css_hint_text_align_special(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_string *align = NULL;
- dom_exception err;
-
- err = dom_element_get_attribute(node,
- corestring_dom_align, &align);
-
- if (err == DOM_NO_ERR && align != NULL) {
- if (dom_string_caseless_lwc_isequal(align,
- corestring_lwc_center)) {
- hint->prop = CSS_PROP_TEXT_ALIGN;
- hint->status = CSS_TEXT_ALIGN_LIBCSS_CENTER;
- hint = css_hint_advance(hint);
-
- } else if (dom_string_caseless_lwc_isequal(align,
- corestring_lwc_left)) {
- hint->prop = CSS_PROP_TEXT_ALIGN;
- hint->status = CSS_TEXT_ALIGN_LIBCSS_LEFT;
- hint = css_hint_advance(hint);
-
- } else if (dom_string_caseless_lwc_isequal(align,
- corestring_lwc_right)) {
- hint->prop = CSS_PROP_TEXT_ALIGN;
- hint->status = CSS_TEXT_ALIGN_LIBCSS_RIGHT;
- hint = css_hint_advance(hint);
-
- } else if (dom_string_caseless_lwc_isequal(align,
- corestring_lwc_justify)) {
- hint->prop = CSS_PROP_TEXT_ALIGN;
- hint->status = CSS_TEXT_ALIGN_JUSTIFY;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(align);
- }
-}
-
-static void css_hint_text_align_table_special(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
-
- hint->prop = CSS_PROP_TEXT_ALIGN;
- hint->status = CSS_TEXT_ALIGN_INHERIT_IF_NON_MAGIC;
- hint = css_hint_advance(hint);
-}
-
-static void css_hint_margin_hspace_vspace(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_string *attr = NULL;
- dom_exception exc;
-
- exc = dom_element_get_attribute(node,
- corestring_dom_vspace, &attr);
-
- if (exc == DOM_NO_ERR && attr != NULL) {
- css_hint_length hint_length;
- if (parse_dimension(
- dom_string_data(attr), false,
- &hint_length.value,
- &hint_length.unit)) {
- hint->prop = CSS_PROP_MARGIN_TOP;
- hint->data.length.value = hint_length.value;
- hint->data.length.unit = hint_length.unit;
- hint->status = CSS_MARGIN_SET;
- hint = css_hint_advance(hint);
-
- hint->prop = CSS_PROP_MARGIN_BOTTOM;
- hint->data.length.value = hint_length.value;
- hint->data.length.unit = hint_length.unit;
- hint->status = CSS_MARGIN_SET;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(attr);
- }
-
- exc = dom_element_get_attribute(node,
- corestring_dom_hspace, &attr);
-
- if (exc == DOM_NO_ERR && attr != NULL) {
- css_hint_length hint_length;
- if (parse_dimension(
- dom_string_data(attr), false,
- &hint_length.value,
- &hint_length.unit)) {
- hint->prop = CSS_PROP_MARGIN_LEFT;
- hint->data.length.value = hint_length.value;
- hint->data.length.unit = hint_length.unit;
- hint->status = CSS_MARGIN_SET;
- hint = css_hint_advance(hint);
-
- hint->prop = CSS_PROP_MARGIN_RIGHT;
- hint->data.length.value = hint_length.value;
- hint->data.length.unit = hint_length.unit;
- hint->status = CSS_MARGIN_SET;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(attr);
- }
-}
-
-static void css_hint_margin_left_right_hr(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_string *attr;
- dom_exception exc;
-
- exc = dom_element_get_attribute(node,
- corestring_dom_align, &attr);
-
- if (exc == DOM_NO_ERR && attr != NULL) {
- if (dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_left)) {
- hint->prop = CSS_PROP_MARGIN_LEFT;
- hint->data.length.value = 0;
- hint->data.length.unit = CSS_UNIT_PX;
- hint->status = CSS_MARGIN_SET;
- hint = css_hint_advance(hint);
-
- hint->prop = CSS_PROP_MARGIN_RIGHT;
- hint->status = CSS_MARGIN_AUTO;
- hint = css_hint_advance(hint);
-
- } else if (dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_center)) {
- hint->prop = CSS_PROP_MARGIN_LEFT;
- hint->status = CSS_MARGIN_AUTO;
- hint = css_hint_advance(hint);
-
- hint->prop = CSS_PROP_MARGIN_RIGHT;
- hint->status = CSS_MARGIN_AUTO;
- hint = css_hint_advance(hint);
-
- } else if (dom_string_caseless_lwc_isequal(attr,
- corestring_lwc_right)) {
- hint->prop = CSS_PROP_MARGIN_LEFT;
- hint->status = CSS_MARGIN_AUTO;
- hint = css_hint_advance(hint);
-
- hint->prop = CSS_PROP_MARGIN_RIGHT;
- hint->data.length.value = 0;
- hint->data.length.unit = CSS_UNIT_PX;
- hint->status = CSS_MARGIN_SET;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(attr);
- }
-}
-
-static void css_hint_table_spacing_border(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_exception exc;
- dom_string *attr = NULL;
-
- exc = dom_element_get_attribute(node, corestring_dom_border, &attr);
-
- if (exc == DOM_NO_ERR && attr != NULL) {
- uint32_t hint_prop;
- css_hint_length hint_length;
-
- for (hint_prop = CSS_PROP_BORDER_TOP_STYLE;
- hint_prop <= CSS_PROP_BORDER_LEFT_STYLE;
- hint_prop++) {
- hint->prop = hint_prop;
- hint->status = CSS_BORDER_STYLE_OUTSET;
- hint = css_hint_advance(hint);
- }
-
- if (parse_dimension(
- dom_string_data(attr), false,
- &hint_length.value,
- &hint_length.unit)) {
-
- for (hint_prop = CSS_PROP_BORDER_TOP_WIDTH;
- hint_prop <= CSS_PROP_BORDER_LEFT_WIDTH;
- hint_prop++) {
- hint->prop = hint_prop;
- hint->data.length.value = hint_length.value;
- hint->data.length.unit = hint_length.unit;
- hint->status = CSS_BORDER_WIDTH_WIDTH;
- hint = css_hint_advance(hint);
- }
- }
- dom_string_unref(attr);
- }
-
- exc = dom_element_get_attribute(node,
- corestring_dom_bordercolor, &attr);
-
- if (exc == DOM_NO_ERR && attr != NULL) {
- uint32_t hint_prop;
- css_color hint_color;
-
- if (nscss_parse_colour(
- (const char *)dom_string_data(attr),
- &hint_color)) {
-
- for (hint_prop = CSS_PROP_BORDER_TOP_COLOR;
- hint_prop <= CSS_PROP_BORDER_LEFT_COLOR;
- hint_prop++) {
- hint->prop = hint_prop;
- hint->data.color = hint_color;
- hint->status = CSS_BORDER_COLOR_COLOR;
- hint = css_hint_advance(hint);
- }
- }
- dom_string_unref(attr);
- }
-
- exc = dom_element_get_attribute(node,
- corestring_dom_cellspacing, &attr);
-
- if (exc == DOM_NO_ERR && attr != NULL) {
- if (parse_dimension(
- (const char *)dom_string_data(attr), false,
- &hint->data.position.h.value,
- &hint->data.position.h.unit)) {
- hint->prop = CSS_PROP_BORDER_SPACING;
- hint->data.position.v = hint->data.position.h;
- hint->status = CSS_BORDER_SPACING_SET;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(attr);
- }
-}
-
-static void css_hint_height(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_string *attr = NULL;
- dom_exception err;
-
- err = dom_element_get_attribute(node,
- corestring_dom_height, &attr);
-
- if (err == DOM_NO_ERR && attr != NULL) {
- if (parse_dimension(
- (const char *)dom_string_data(attr), false,
- &hint->data.length.value,
- &hint->data.length.unit)) {
- hint->prop = CSS_PROP_HEIGHT;
- hint->status = CSS_HEIGHT_SET;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(attr);
- }
-}
-
-static void css_hint_width(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_string *attr = NULL;
- dom_exception err;
-
- err = dom_element_get_attribute(node,
- corestring_dom_width, &attr);
-
- if (err == DOM_NO_ERR && attr != NULL) {
- if (parse_dimension(
- (const char *)dom_string_data(attr), false,
- &hint->data.length.value,
- &hint->data.length.unit)) {
- hint->prop = CSS_PROP_WIDTH;
- hint->status = CSS_WIDTH_SET;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(attr);
- }
-}
-
-static void css_hint_height_width_textarea(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_string *attr = NULL;
- dom_exception err;
-
- err = dom_element_get_attribute(node,
- corestring_dom_rows, &attr);
-
- if (err == DOM_NO_ERR && attr != NULL) {
- if (parse_dimension(
- (const char *)dom_string_data(attr), false,
- &hint->data.length.value,
- &hint->data.length.unit)) {
- hint->prop = CSS_PROP_HEIGHT;
- hint->data.length.unit = CSS_UNIT_EM;
- hint->status = CSS_HEIGHT_SET;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(attr);
- }
-
- err = dom_element_get_attribute(node,
- corestring_dom_cols, &attr);
-
- if (err == DOM_NO_ERR && attr != NULL) {
- if (parse_dimension(
- (const char *)dom_string_data(attr), false,
- &hint->data.length.value,
- &hint->data.length.unit)) {
- hint->prop = CSS_PROP_WIDTH;
- hint->data.length.unit = CSS_UNIT_EX;
- hint->status = CSS_WIDTH_SET;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(attr);
- }
-}
-
-static void css_hint_width_input(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &(hint_ctx.hints[hint_ctx.len]);
- dom_string *attr = NULL;
- dom_exception err;
-
- err = dom_element_get_attribute(node,
- corestring_dom_size, &attr);
-
- if (err == DOM_NO_ERR && attr != NULL) {
- if (parse_dimension(
- (const char *)dom_string_data(attr), false,
- &hint->data.length.value,
- &hint->data.length.unit)) {
- dom_string *attr2 = NULL;
-
- err = dom_element_get_attribute(node,
- corestring_dom_type, &attr2);
- if (err == DOM_NO_ERR) {
-
- hint->prop = CSS_PROP_WIDTH;
- hint->status = CSS_WIDTH_SET;
-
- if (attr2 == NULL ||
- dom_string_caseless_lwc_isequal(
- attr2,
- corestring_lwc_text) ||
- dom_string_caseless_lwc_isequal(
- attr2,
- corestring_lwc_search) ||
- dom_string_caseless_lwc_isequal(
- attr2,
- corestring_lwc_password) ||
- dom_string_caseless_lwc_isequal(
- attr2,
- corestring_lwc_file)) {
- hint->data.length.unit = CSS_UNIT_EX;
- }
- if (attr2 != NULL) {
- dom_string_unref(attr2);
- }
- hint = css_hint_advance(hint);
- }
- }
- dom_string_unref(attr);
- }
-}
-
-static void css_hint_anchor_color(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- css_error error;
- dom_exception err;
- dom_string *color;
- dom_node *bodynode = NULL;
-
- /* find body node */
- css_qname qs;
- bool is_visited;
-
- qs.ns = NULL;
- qs.name = lwc_string_ref(corestring_lwc_body);
- if (named_ancestor_node(ctx, node, &qs,
- (void *)&bodynode) != CSS_OK) {
- /* Didn't find, or had error */
- lwc_string_unref(qs.name);
- return ;
- }
- lwc_string_unref(qs.name);
-
- if (bodynode == NULL) {
- return;
- }
-
- error = node_is_visited(ctx, node, &is_visited);
- if (error != CSS_OK)
- return;
-
- if (is_visited) {
- err = dom_element_get_attribute(bodynode,
- corestring_dom_vlink, &color);
- } else {
- err = dom_element_get_attribute(bodynode,
- corestring_dom_link, &color);
- }
-
- if (err == DOM_NO_ERR && color != NULL) {
- if (nscss_parse_colour(
- (const char *)dom_string_data(color),
- &hint->data.color)) {
- hint->prop = CSS_PROP_COLOR;
- hint->status = CSS_COLOR_COLOR;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(color);
- }
-}
-
-static void css_hint_body_color(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_exception err;
- dom_string *color;
-
- err = dom_element_get_attribute(node, corestring_dom_text, &color);
-
- if (err == DOM_NO_ERR && color != NULL) {
- if (nscss_parse_colour(
- (const char *)dom_string_data(color),
- &hint->data.color)) {
- hint->prop = CSS_PROP_COLOR;
- hint->status = CSS_COLOR_COLOR;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(color);
- }
-}
-
-static void css_hint_color(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_exception err;
- dom_string *color;
-
- err = dom_element_get_attribute(node, corestring_dom_color, &color);
-
- if (err == DOM_NO_ERR && color != NULL) {
- if (nscss_parse_colour(
- (const char *)dom_string_data(color),
- &hint->data.color)) {
- hint->prop = CSS_PROP_COLOR;
- hint->status = CSS_COLOR_COLOR;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(color);
- }
-}
-
-static void css_hint_font_size(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_exception err;
- dom_string *size;
-
- err = dom_element_get_attribute(node, corestring_dom_size, &size);
- if (err == DOM_NO_ERR && size != NULL) {
- if (parse_font_size(
- (const char *)dom_string_data(size),
- &hint->status,
- &hint->data.length.value,
- &hint->data.length.unit)) {
- hint->prop = CSS_PROP_FONT_SIZE;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(size);
- }
-}
-
-static void css_hint_float(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_exception err;
- dom_string *align;
-
- err = dom_element_get_attribute(node, corestring_dom_align, &align);
- if (err == DOM_NO_ERR && align != NULL) {
- if (dom_string_caseless_lwc_isequal(align,
- corestring_lwc_left)) {
- hint->prop = CSS_PROP_FLOAT;
- hint->status = CSS_FLOAT_LEFT;
- hint = css_hint_advance(hint);
-
- } else if (dom_string_caseless_lwc_isequal(align,
- corestring_lwc_right)) {
- hint->prop = CSS_PROP_FLOAT;
- hint->status = CSS_FLOAT_RIGHT;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(align);
- }
-}
-
-static void css_hint_caption_side(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_exception err;
- dom_string *align = NULL;
-
- err = dom_element_get_attribute(node, corestring_dom_align, &align);
- if (err == DOM_NO_ERR && align != NULL) {
- if (dom_string_caseless_lwc_isequal(align,
- corestring_lwc_bottom)) {
- hint->prop = CSS_PROP_CAPTION_SIDE;
- hint->status = CSS_CAPTION_SIDE_BOTTOM;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(align);
- }
-}
-
-static void css_hint_bg_color(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
- dom_exception err;
- dom_string *bgcolor;
-
- err = dom_element_get_attribute(node,
- corestring_dom_bgcolor, &bgcolor);
- if (err == DOM_NO_ERR && bgcolor != NULL) {
- if (nscss_parse_colour(
- (const char *)dom_string_data(bgcolor),
- &hint->data.color)) {
- hint->prop = CSS_PROP_BACKGROUND_COLOR;
- hint->status = CSS_BACKGROUND_COLOR_COLOR;
- hint = css_hint_advance(hint);
- }
- dom_string_unref(bgcolor);
- }
-}
-
-static void css_hint_bg_image(
- nscss_select_ctx *ctx,
- dom_node *node)
-{
- struct css_hint *hint = &(hint_ctx.hints[hint_ctx.len]);
- dom_exception err;
- dom_string *attr;
-
- err = dom_element_get_attribute(node,
- corestring_dom_background, &attr);
- if (err == DOM_NO_ERR && attr != NULL) {
- nsurl *url;
- nserror error = nsurl_join(ctx->base_url,
- (const char *)dom_string_data(attr), &url);
- dom_string_unref(attr);
-
- if (error == NSERROR_OK) {
- lwc_string *iurl;
- lwc_error lerror = lwc_intern_string(nsurl_access(url),
- nsurl_length(url), &iurl);
- nsurl_unref(url);
-
- if (lerror == lwc_error_ok) {
- hint->prop = CSS_PROP_BACKGROUND_IMAGE;
- hint->data.string = iurl;
- hint->status = CSS_BACKGROUND_IMAGE_IMAGE;
- hint = css_hint_advance(hint);
- }
- }
- }
-}
-
-
-/* Exported function, documeted in css/hints.h */
-css_error node_presentational_hint(void *pw, void *node,
- uint32_t *nhints, css_hint **hints)
-{
- dom_exception exc;
- dom_html_element_type tag_type;
-
- css_hint_clean();
-
- exc = dom_html_element_get_tag_type(node, &tag_type);
- if (exc != DOM_NO_ERR) {
- tag_type = DOM_HTML_ELEMENT_TYPE__UNKNOWN;
- }
-
- switch (tag_type) {
- case DOM_HTML_ELEMENT_TYPE_TH:
- case DOM_HTML_ELEMENT_TYPE_TD:
- css_hint_width(pw, node);
- css_hint_table_cell_border_padding(pw, node);
- /* fallthrough */
- case DOM_HTML_ELEMENT_TYPE_TR:
- css_hint_height(pw, node);
- /* fallthrough */
- case DOM_HTML_ELEMENT_TYPE_THEAD:
- case DOM_HTML_ELEMENT_TYPE_TBODY:
- case DOM_HTML_ELEMENT_TYPE_TFOOT:
- css_hint_text_align_special(pw, node);
- /* fallthrough */
- case DOM_HTML_ELEMENT_TYPE_COL:
- css_hint_vertical_align_table_cells(pw, node);
- break;
- case DOM_HTML_ELEMENT_TYPE_APPLET:
- case DOM_HTML_ELEMENT_TYPE_IMG:
- css_hint_margin_hspace_vspace(pw, node);
- /* fallthrough */
- case DOM_HTML_ELEMENT_TYPE_EMBED:
- case DOM_HTML_ELEMENT_TYPE_IFRAME:
- case DOM_HTML_ELEMENT_TYPE_OBJECT:
- css_hint_height(pw, node);
- css_hint_width(pw, node);
- css_hint_vertical_align_replaced(pw, node);
- css_hint_float(pw, node);
- break;
- case DOM_HTML_ELEMENT_TYPE_P:
- case DOM_HTML_ELEMENT_TYPE_H1:
- case DOM_HTML_ELEMENT_TYPE_H2:
- case DOM_HTML_ELEMENT_TYPE_H3:
- case DOM_HTML_ELEMENT_TYPE_H4:
- case DOM_HTML_ELEMENT_TYPE_H5:
- case DOM_HTML_ELEMENT_TYPE_H6:
- css_hint_text_align_normal(pw, node);
- break;
- case DOM_HTML_ELEMENT_TYPE_CENTER:
- css_hint_text_align_center(pw, node);
- break;
- case DOM_HTML_ELEMENT_TYPE_CAPTION:
- css_hint_caption_side(pw, node);
- /* fallthrough */
- case DOM_HTML_ELEMENT_TYPE_DIV:
- css_hint_text_align_special(pw, node);
- break;
- case DOM_HTML_ELEMENT_TYPE_TABLE:
- css_hint_text_align_table_special(pw, node);
- css_hint_table_spacing_border(pw, node);
- css_hint_float(pw, node);
- css_hint_margin_left_right_align_center(pw, node);
- css_hint_width(pw, node);
- break;
- case DOM_HTML_ELEMENT_TYPE_HR:
- css_hint_margin_left_right_hr(pw, node);
- break;
- case DOM_HTML_ELEMENT_TYPE_TEXTAREA:
- css_hint_height_width_textarea(pw, node);
- break;
- case DOM_HTML_ELEMENT_TYPE_INPUT:
- css_hint_width_input(pw, node);
- break;
- case DOM_HTML_ELEMENT_TYPE_A:
- css_hint_anchor_color(pw, node);
- break;
- case DOM_HTML_ELEMENT_TYPE_FONT:
- css_hint_font_size(pw, node);
- break;
- case DOM_HTML_ELEMENT_TYPE_BODY:
- css_hint_body_color(pw, node);
- break;
- default:
- break;
- }
-
- if (tag_type != DOM_HTML_ELEMENT_TYPE__UNKNOWN) {
- css_hint_color(pw, node);
- css_hint_bg_color(pw, node);
- css_hint_bg_image(pw, node);
- }
-
-#ifdef LOG_STATS
- LOG("Properties with hints: %i", hint_ctx.len);
-#endif
-
- css_hint_get_hints(hints, nhints);
-
- return CSS_OK;
-}
-
diff --git a/css/hints.h b/css/hints.h
deleted file mode 100644
index fda1bec..0000000
--- a/css/hints.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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 NETSURF_CSS_HINTS_H_
-#define NETSURF_CSS_HINTS_H_
-
-#include <stdint.h>
-
-#include "css/css.h"
-
-nserror css_hint_init(void);
-void css_hint_fini(void);
-
-
-/**
- * Callback to retrieve presentational hints for a node
- *
- * \param[in] pw HTML document
- * \param[in] node DOM node
- * \param[out] nhints number of hints retrived
- * \param[out] hints retrived hints
- * \return CSS_OK on success,
- * CSS_PROPERTY_NOT_SET if there is no hint for the requested property,
- * CSS_NOMEM on memory exhaustion.
- */
-css_error node_presentational_hint(
- void *pw,
- void *node,
- uint32_t *nhints,
- css_hint **hints);
-
-bool nscss_parse_colour(const char *data, css_color *result);
-
-#endif
diff --git a/css/internal.c b/css/internal.c
deleted file mode 100644
index 46c529b..0000000
--- a/css/internal.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-#include <string.h>
-
-#include "css/internal.h"
-
-#include "utils/nsurl.h"
-
-/**
- * URL resolution callback for libcss
- *
- * \param pw Resolution context
- * \param base Base URI
- * \param rel Relative URL
- * \param abs Pointer to location to receive resolved URL
- * \return CSS_OK on success,
- * CSS_NOMEM on memory exhaustion,
- * CSS_INVALID if resolution failed.
- */
-css_error nscss_resolve_url(void *pw, const char *base,
- lwc_string *rel, lwc_string **abs)
-{
- lwc_error lerror;
- nserror error;
- nsurl *nsbase;
- nsurl *nsabs;
-
- /* Create nsurl from base */
- /* TODO: avoid this */
- error = nsurl_create(base, &nsbase);
- if (error != NSERROR_OK) {
- return error == NSERROR_NOMEM ? CSS_NOMEM : CSS_INVALID;
- }
-
- /* Resolve URI */
- error = nsurl_join(nsbase, lwc_string_data(rel), &nsabs);
- if (error != NSERROR_OK) {
- nsurl_unref(nsbase);
- return error == NSERROR_NOMEM ? CSS_NOMEM : CSS_INVALID;
- }
-
- nsurl_unref(nsbase);
-
- /* Intern it */
- lerror = lwc_intern_string(nsurl_access(nsabs),
- nsurl_length(nsabs), abs);
- if (lerror != lwc_error_ok) {
- *abs = NULL;
- nsurl_unref(nsabs);
- return lerror == lwc_error_oom ? CSS_NOMEM : CSS_INVALID;
- }
-
- nsurl_unref(nsabs);
-
- return CSS_OK;
-}
-
diff --git a/css/internal.h b/css/internal.h
deleted file mode 100644
index 0344d6b..0000000
--- a/css/internal.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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 NETSURF_CSS_INTERNAL_H_
-#define NETSURF_CSS_INTERNAL_H_
-
-#include "css/css.h"
-
-css_error nscss_resolve_url(void *pw, const char *base,
- lwc_string *rel, lwc_string **abs);
-
-#endif
diff --git a/css/select.c b/css/select.c
deleted file mode 100644
index a929cf1..0000000
--- a/css/select.c
+++ /dev/null
@@ -1,1854 +0,0 @@
-/*
- * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-#include <assert.h>
-#include <string.h>
-#include <strings.h>
-
-#include "content/urldb.h"
-#include "desktop/system_colour.h"
-#include "utils/nsoption.h"
-#include "utils/corestrings.h"
-#include "utils/log.h"
-
-#include "css/internal.h"
-#include "css/hints.h"
-#include "css/select.h"
-
-static css_error node_name(void *pw, void *node, css_qname *qname);
-static css_error node_classes(void *pw, void *node,
- lwc_string ***classes, uint32_t *n_classes);
-static css_error node_id(void *pw, void *node, lwc_string **id);
-static css_error named_parent_node(void *pw, void *node,
- const css_qname *qname, void **parent);
-static css_error named_sibling_node(void *pw, void *node,
- const css_qname *qname, void **sibling);
-static css_error named_generic_sibling_node(void *pw, void *node,
- const css_qname *qname, void **sibling);
-static css_error parent_node(void *pw, void *node, void **parent);
-static css_error sibling_node(void *pw, void *node, void **sibling);
-static css_error node_has_name(void *pw, void *node,
- const css_qname *qname, bool *match);
-static css_error node_has_class(void *pw, void *node,
- lwc_string *name, bool *match);
-static css_error node_has_id(void *pw, void *node,
- lwc_string *name, bool *match);
-static css_error node_has_attribute(void *pw, void *node,
- const css_qname *qname, bool *match);
-static css_error node_has_attribute_equal(void *pw, void *node,
- const css_qname *qname, lwc_string *value,
- bool *match);
-static css_error node_has_attribute_dashmatch(void *pw, void *node,
- const css_qname *qname, lwc_string *value,
- bool *match);
-static css_error node_has_attribute_includes(void *pw, void *node,
- const css_qname *qname, lwc_string *value,
- bool *match);
-static css_error node_has_attribute_prefix(void *pw, void *node,
- const css_qname *qname, lwc_string *value,
- bool *match);
-static css_error node_has_attribute_suffix(void *pw, void *node,
- const css_qname *qname, lwc_string *value,
- bool *match);
-static css_error node_has_attribute_substring(void *pw, void *node,
- const css_qname *qname, lwc_string *value,
- bool *match);
-static css_error node_is_root(void *pw, void *node, bool *match);
-static css_error node_count_siblings(void *pw, void *node,
- bool same_name, bool after, int32_t *count);
-static css_error node_is_empty(void *pw, void *node, bool *match);
-static css_error node_is_link(void *pw, void *node, bool *match);
-static css_error node_is_hover(void *pw, void *node, bool *match);
-static css_error node_is_active(void *pw, void *node, bool *match);
-static css_error node_is_focus(void *pw, void *node, bool *match);
-static css_error node_is_enabled(void *pw, void *node, bool *match);
-static css_error node_is_disabled(void *pw, void *node, bool *match);
-static css_error node_is_checked(void *pw, void *node, bool *match);
-static css_error node_is_target(void *pw, void *node, bool *match);
-static css_error node_is_lang(void *pw, void *node,
- lwc_string *lang, bool *match);
-static css_error ua_default_for_property(void *pw, uint32_t property,
- css_hint *hint);
-static css_error set_libcss_node_data(void *pw, void *node,
- void *libcss_node_data);
-static css_error get_libcss_node_data(void *pw, void *node,
- void **libcss_node_data);
-
-static css_error nscss_compute_font_size(void *pw, const css_hint *parent,
- css_hint *size);
-
-
-/**
- * Selection callback table for libcss
- */
-static css_select_handler selection_handler = {
- CSS_SELECT_HANDLER_VERSION_1,
-
- node_name,
- node_classes,
- node_id,
- named_ancestor_node,
- named_parent_node,
- named_sibling_node,
- named_generic_sibling_node,
- parent_node,
- sibling_node,
- node_has_name,
- node_has_class,
- node_has_id,
- node_has_attribute,
- node_has_attribute_equal,
- node_has_attribute_dashmatch,
- node_has_attribute_includes,
- node_has_attribute_prefix,
- node_has_attribute_suffix,
- node_has_attribute_substring,
- node_is_root,
- node_count_siblings,
- node_is_empty,
- node_is_link,
- node_is_visited,
- node_is_hover,
- node_is_active,
- node_is_focus,
- node_is_enabled,
- node_is_disabled,
- node_is_checked,
- node_is_target,
- node_is_lang,
- node_presentational_hint,
- ua_default_for_property,
- nscss_compute_font_size,
- set_libcss_node_data,
- get_libcss_node_data
-};
-
-/**
- * Create an inline style
- *
- * \param data Source data
- * \param len Length of data in bytes
- * \param charset Charset of data, or NULL if unknown
- * \param url Base URL of document containing data
- * \param allow_quirks True to permit CSS parsing quirks
- * \return Pointer to stylesheet, or NULL on failure.
- */
-css_stylesheet *nscss_create_inline_style(const uint8_t *data, size_t len,
- const char *charset, const char *url, bool allow_quirks)
-{
- css_stylesheet_params params;
- css_stylesheet *sheet;
- css_error error;
-
- params.params_version = CSS_STYLESHEET_PARAMS_VERSION_1;
- params.level = CSS_LEVEL_DEFAULT;
- params.charset = charset;
- params.url = url;
- params.title = NULL;
- params.allow_quirks = allow_quirks;
- params.inline_style = true;
- params.resolve = nscss_resolve_url;
- params.resolve_pw = NULL;
- params.import = NULL;
- params.import_pw = NULL;
- params.color = ns_system_colour;
- params.color_pw = NULL;
- params.font = NULL;
- params.font_pw = NULL;
-
- error = css_stylesheet_create(¶ms, &sheet);
- if (error != CSS_OK) {
- LOG("Failed creating sheet: %d", error);
- return NULL;
- }
-
- error = css_stylesheet_append_data(sheet, data, len);
- if (error != CSS_OK && error != CSS_NEEDDATA) {
- LOG("failed appending data: %d", error);
- css_stylesheet_destroy(sheet);
- return NULL;
- }
-
- error = css_stylesheet_data_done(sheet);
- if (error != CSS_OK) {
- LOG("failed completing parse: %d", error);
- css_stylesheet_destroy(sheet);
- return NULL;
- }
-
- return sheet;
-}
-
-/* Handler for libcss_node_data, stored as libdom node user data */
-static void nscss_dom_user_data_handler(dom_node_operation operation,
- dom_string *key, void *data, struct dom_node *src,
- struct dom_node *dst)
-{
- css_error error;
-
- if (dom_string_isequal(corestring_dom___ns_key_libcss_node_data,
- key) == false || data == NULL) {
- return;
- }
-
- switch (operation) {
- case DOM_NODE_CLONED:
- error = css_libcss_node_data_handler(&selection_handler,
- CSS_NODE_CLONED,
- NULL, src, dst, data);
- if (error != CSS_OK)
- LOG("Failed to clone libcss_node_data.");
- break;
-
- case DOM_NODE_RENAMED:
- error = css_libcss_node_data_handler(&selection_handler,
- CSS_NODE_MODIFIED,
- NULL, src, NULL, data);
- if (error != CSS_OK)
- LOG("Failed to update libcss_node_data.");
- break;
-
- case DOM_NODE_IMPORTED:
- case DOM_NODE_ADOPTED:
- case DOM_NODE_DELETED:
- error = css_libcss_node_data_handler(&selection_handler,
- CSS_NODE_DELETED,
- NULL, src, NULL, data);
- if (error != CSS_OK)
- LOG("Failed to delete libcss_node_data.");
- break;
-
- default:
- LOG("User data operation not handled.");
- assert(0);
- }
-}
-
-/**
- * Get style selection results for an element
- *
- * \param ctx CSS selection context
- * \param n Element to select for
- * \param media Permitted media types
- * \param inline_style Inline style associated with element, or NULL
- * \return Pointer to selection results (containing computed styles),
- * or NULL on failure
- */
-css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
- uint64_t media, const css_stylesheet *inline_style)
-{
- css_select_results *styles;
- int pseudo_element;
- css_error error;
-
- /* Select style for node */
- error = css_select_style(ctx->ctx, n, media, inline_style,
- &selection_handler, ctx, &styles);
-
- if (error != CSS_OK || styles == NULL) {
- /* Failed selecting partial style -- bail out */
- return NULL;
- }
-
- /* If there's a parent style, compose with partial to obtain
- * complete computed style for element */
- if (ctx->parent_style != NULL) {
- /* Complete the computed style, by composing with the parent
- * element's style */
- error = css_computed_style_compose(ctx->parent_style,
- styles->styles[CSS_PSEUDO_ELEMENT_NONE],
- nscss_compute_font_size, NULL,
- styles->styles[CSS_PSEUDO_ELEMENT_NONE]);
- if (error != CSS_OK) {
- css_select_results_destroy(styles);
- return NULL;
- }
- }
-
- for (pseudo_element = CSS_PSEUDO_ELEMENT_NONE + 1;
- pseudo_element < CSS_PSEUDO_ELEMENT_COUNT;
- pseudo_element++) {
-
- if (pseudo_element == CSS_PSEUDO_ELEMENT_FIRST_LETTER ||
- pseudo_element == CSS_PSEUDO_ELEMENT_FIRST_LINE)
- /* TODO: Handle first-line and first-letter pseudo
- * element computed style completion */
- continue;
-
- if (styles->styles[pseudo_element] == NULL)
- /* There were no rules concerning this pseudo element */
- continue;
-
- /* Complete the pseudo element's computed style, by composing
- * with the base element's style */
- error = css_computed_style_compose(
- styles->styles[CSS_PSEUDO_ELEMENT_NONE],
- styles->styles[pseudo_element],
- nscss_compute_font_size, NULL,
- styles->styles[pseudo_element]);
- if (error != CSS_OK) {
- /* TODO: perhaps this shouldn't be quite so
- * catastrophic? */
- css_select_results_destroy(styles);
- return NULL;
- }
- }
-
- return styles;
-}
-
-/**
- * Get an initial style
- *
- * \param ctx CSS selection context
- * \return Pointer to partial computed style, or NULL on failure
- */
-static css_computed_style *nscss_get_initial_style(nscss_select_ctx *ctx)
-{
- css_computed_style *style;
- css_error error;
-
- error = css_computed_style_create(&style);
- if (error != CSS_OK)
- return NULL;
-
- error = css_computed_style_initialise(style, &selection_handler, ctx);
- if (error != CSS_OK) {
- css_computed_style_destroy(style);
- return NULL;
- }
-
- return style;
-}
-
-/**
- * Get a blank style
- *
- * \param ctx CSS selection context
- * \param parent Parent style to cascade inherited properties from
- * \return Pointer to blank style, or NULL on failure
- */
-css_computed_style *nscss_get_blank_style(nscss_select_ctx *ctx,
- const css_computed_style *parent)
-{
- css_computed_style *partial;
- css_error error;
-
- partial = nscss_get_initial_style(ctx);
- if (partial == NULL)
- return NULL;
-
- error = css_computed_style_compose(parent, partial,
- nscss_compute_font_size, NULL, partial);
- if (error != CSS_OK) {
- css_computed_style_destroy(partial);
- return NULL;
- }
-
- return partial;
-}
-
-/**
- * Font size computation callback for libcss
- *
- * \param pw Computation context
- * \param parent Parent font size (absolute)
- * \param size Font size to compute
- * \return CSS_OK on success
- *
- * \post \a size will be an absolute font size
- */
-css_error nscss_compute_font_size(void *pw, const css_hint *parent,
- css_hint *size)
-{
- /**
- * Table of font-size keyword scale factors
- *
- * These are multiplied by the configured default font size
- * to produce an absolute size for the relevant keyword
- */
- static const css_fixed factors[] = {
- FLTTOFIX(0.5625), /* xx-small */
- FLTTOFIX(0.6250), /* x-small */
- FLTTOFIX(0.8125), /* small */
- FLTTOFIX(1.0000), /* medium */
- FLTTOFIX(1.1250), /* large */
- FLTTOFIX(1.5000), /* x-large */
- FLTTOFIX(2.0000) /* xx-large */
- };
- css_hint_length parent_size;
-
- /* Grab parent size, defaulting to medium if none */
- if (parent == NULL) {
- parent_size.value = FDIV(FMUL(factors[CSS_FONT_SIZE_MEDIUM - 1],
- INTTOFIX(nsoption_int(font_size))),
- INTTOFIX(10));
- parent_size.unit = CSS_UNIT_PT;
- } else {
- assert(parent->status == CSS_FONT_SIZE_DIMENSION);
- assert(parent->data.length.unit != CSS_UNIT_EM);
- assert(parent->data.length.unit != CSS_UNIT_EX);
- assert(parent->data.length.unit != CSS_UNIT_PCT);
-
- parent_size = parent->data.length;
- }
-
- assert(size->status != CSS_FONT_SIZE_INHERIT);
-
- if (size->status < CSS_FONT_SIZE_LARGER) {
- /* Keyword -- simple */
- size->data.length.value = FDIV(FMUL(factors[size->status - 1],
- INTTOFIX(nsoption_int(font_size))), F_10);
- size->data.length.unit = CSS_UNIT_PT;
- } else if (size->status == CSS_FONT_SIZE_LARGER) {
- /** \todo Step within table, if appropriate */
- size->data.length.value =
- FMUL(parent_size.value, FLTTOFIX(1.2));
- size->data.length.unit = parent_size.unit;
- } else if (size->status == CSS_FONT_SIZE_SMALLER) {
- /** \todo Step within table, if appropriate */
- size->data.length.value =
- FDIV(parent_size.value, FLTTOFIX(1.2));
- size->data.length.unit = parent_size.unit;
- } else if (size->data.length.unit == CSS_UNIT_EM ||
- size->data.length.unit == CSS_UNIT_EX) {
- size->data.length.value =
- FMUL(size->data.length.value, parent_size.value);
-
- if (size->data.length.unit == CSS_UNIT_EX) {
- /* 1ex = 0.6em in NetSurf */
- size->data.length.value = FMUL(size->data.length.value,
- FLTTOFIX(0.6));
- }
-
- size->data.length.unit = parent_size.unit;
- } else if (size->data.length.unit == CSS_UNIT_PCT) {
- size->data.length.value = FDIV(FMUL(size->data.length.value,
- parent_size.value), INTTOFIX(100));
- size->data.length.unit = parent_size.unit;
- }
-
- size->status = CSS_FONT_SIZE_DIMENSION;
-
- return CSS_OK;
-}
-
-/******************************************************************************
- * Style selection callbacks *
- ******************************************************************************/
-
-/**
- * Callback to retrieve a node's name.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param qname Pointer to location to receive node name
- * \return CSS_OK on success,
- * CSS_NOMEM on memory exhaustion.
- */
-css_error node_name(void *pw, void *node, css_qname *qname)
-{
- dom_node *n = node;
- dom_string *name;
- dom_exception err;
-
- err = dom_node_get_node_name(n, &name);
- if (err != DOM_NO_ERR)
- return CSS_NOMEM;
-
- qname->ns = NULL;
-
- err = dom_string_intern(name, &qname->name);
- if (err != DOM_NO_ERR) {
- dom_string_unref(name);
- return CSS_NOMEM;
- }
-
- dom_string_unref(name);
-
- return CSS_OK;
-}
-
-/**
- * Callback to retrieve a node's classes.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param classes Pointer to location to receive class name array
- * \param n_classes Pointer to location to receive length of class name array
- * \return CSS_OK on success,
- * CSS_NOMEM on memory exhaustion.
- *
- * \note The returned array will be destroyed by libcss. Therefore, it must
- * be allocated using the same allocator as used by libcss during style
- * selection.
- */
-css_error node_classes(void *pw, void *node,
- lwc_string ***classes, uint32_t *n_classes)
-{
- dom_node *n = node;
- dom_exception err;
-
- *classes = NULL;
- *n_classes = 0;
-
- err = dom_element_get_classes(n, classes, n_classes);
- if (err != DOM_NO_ERR)
- return CSS_NOMEM;
-
- return CSS_OK;
-}
-
-/**
- * Callback to retrieve a node's ID.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param id Pointer to location to receive id value
- * \return CSS_OK on success,
- * CSS_NOMEM on memory exhaustion.
- */
-css_error node_id(void *pw, void *node, lwc_string **id)
-{
- dom_node *n = node;
- dom_string *attr;
- dom_exception err;
-
- *id = NULL;
-
- /** \todo Assumes an HTML DOM */
- err = dom_html_element_get_id(n, &attr);
- if (err != DOM_NO_ERR)
- return CSS_NOMEM;
-
- if (attr != NULL) {
- err = dom_string_intern(attr, id);
- if (err != DOM_NO_ERR) {
- dom_string_unref(attr);
- return CSS_NOMEM;
- }
- dom_string_unref(attr);
- }
-
- return CSS_OK;
-}
-
-/**
- * Callback to find a named ancestor node.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param qname Node name to search for
- * \param ancestor Pointer to location to receive ancestor
- * \return CSS_OK.
- *
- * \post \a ancestor will contain the result, or NULL if there is no match
- */
-css_error named_ancestor_node(void *pw, void *node,
- const css_qname *qname, void **ancestor)
-{
- dom_element_named_ancestor_node(node, qname->name,
- (struct dom_element **)ancestor);
-
- return CSS_OK;
-}
-
-/**
- * Callback to find a named parent node
- *
- * \param pw HTML document
- * \param node DOM node
- * \param qname Node name to search for
- * \param parent Pointer to location to receive parent
- * \return CSS_OK.
- *
- * \post \a parent will contain the result, or NULL if there is no match
- */
-css_error named_parent_node(void *pw, void *node,
- const css_qname *qname, void **parent)
-{
- dom_element_named_parent_node(node, qname->name,
- (struct dom_element **)parent);
-
- return CSS_OK;
-}
-
-/**
- * Callback to find a named sibling node.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param qname Node name to search for
- * \param sibling Pointer to location to receive sibling
- * \return CSS_OK.
- *
- * \post \a sibling will contain the result, or NULL if there is no match
- */
-css_error named_sibling_node(void *pw, void *node,
- const css_qname *qname, void **sibling)
-{
- dom_node *n = node;
- dom_node *prev;
- dom_exception err;
-
- *sibling = NULL;
-
- /* Find sibling element */
- err = dom_node_get_previous_sibling(n, &n);
- if (err != DOM_NO_ERR)
- return CSS_OK;
-
- while (n != NULL) {
- dom_node_type type;
-
- err = dom_node_get_node_type(n, &type);
- if (err != DOM_NO_ERR) {
- dom_node_unref(n);
- return CSS_OK;
- }
-
- if (type == DOM_ELEMENT_NODE)
- break;
-
- err = dom_node_get_previous_sibling(n, &prev);
- if (err != DOM_NO_ERR) {
- dom_node_unref(n);
- return CSS_OK;
- }
-
- dom_node_unref(n);
- n = prev;
- }
-
- if (n != NULL) {
- dom_string *name;
-
- err = dom_node_get_node_name(n, &name);
- if (err != DOM_NO_ERR) {
- dom_node_unref(n);
- return CSS_OK;
- }
-
- dom_node_unref(n);
-
- if (dom_string_caseless_lwc_isequal(name, qname->name)) {
- *sibling = n;
- }
-
- dom_string_unref(name);
- }
-
- return CSS_OK;
-}
-
-/**
- * Callback to find a named generic sibling node.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param qname Node name to search for
- * \param sibling Pointer to location to receive ancestor
- * \return CSS_OK.
- *
- * \post \a sibling will contain the result, or NULL if there is no match
- */
-css_error named_generic_sibling_node(void *pw, void *node,
- const css_qname *qname, void **sibling)
-{
- dom_node *n = node;
- dom_node *prev;
- dom_exception err;
-
- *sibling = NULL;
-
- err = dom_node_get_previous_sibling(n, &n);
- if (err != DOM_NO_ERR)
- return CSS_OK;
-
- while (n != NULL) {
- dom_node_type type;
- dom_string *name;
-
- err = dom_node_get_node_type(n, &type);
- if (err != DOM_NO_ERR) {
- dom_node_unref(n);
- return CSS_OK;
- }
-
- if (type == DOM_ELEMENT_NODE) {
- err = dom_node_get_node_name(n, &name);
- if (err != DOM_NO_ERR) {
- dom_node_unref(n);
- return CSS_OK;
- }
-
- if (dom_string_caseless_lwc_isequal(name,
- qname->name)) {
- dom_string_unref(name);
- dom_node_unref(n);
- *sibling = n;
- break;
- }
- dom_string_unref(name);
- }
-
- err = dom_node_get_previous_sibling(n, &prev);
- if (err != DOM_NO_ERR) {
- dom_node_unref(n);
- return CSS_OK;
- }
-
- dom_node_unref(n);
- n = prev;
- }
-
- return CSS_OK;
-}
-
-/**
- * Callback to retrieve the parent of a node.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param parent Pointer to location to receive parent
- * \return CSS_OK.
- *
- * \post \a parent will contain the result, or NULL if there is no match
- */
-css_error parent_node(void *pw, void *node, void **parent)
-{
- dom_element_parent_node(node, (struct dom_element **)parent);
-
- return CSS_OK;
-}
-
-/**
- * Callback to retrieve the preceding sibling of a node.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param sibling Pointer to location to receive sibling
- * \return CSS_OK.
- *
- * \post \a sibling will contain the result, or NULL if there is no match
- */
-css_error sibling_node(void *pw, void *node, void **sibling)
-{
- dom_node *n = node;
- dom_node *prev;
- dom_exception err;
-
- *sibling = NULL;
-
- /* Find sibling element */
- err = dom_node_get_previous_sibling(n, &n);
- if (err != DOM_NO_ERR)
- return CSS_OK;
-
- while (n != NULL) {
- dom_node_type type;
-
- err = dom_node_get_node_type(n, &type);
- if (err != DOM_NO_ERR) {
- dom_node_unref(n);
- return CSS_OK;
- }
-
- if (type == DOM_ELEMENT_NODE)
- break;
-
- err = dom_node_get_previous_sibling(n, &prev);
- if (err != DOM_NO_ERR) {
- dom_node_unref(n);
- return CSS_OK;
- }
-
- dom_node_unref(n);
- n = prev;
- }
-
- if (n != NULL) {
- /** \todo Sort out reference counting */
- dom_node_unref(n);
-
- *sibling = n;
- }
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node has the given name.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param qname Name to match
- * \param match Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_has_name(void *pw, void *node,
- const css_qname *qname, bool *match)
-{
- nscss_select_ctx *ctx = pw;
- dom_node *n = node;
-
- if (lwc_string_isequal(qname->name, ctx->universal, match) ==
- lwc_error_ok && *match == false) {
- dom_string *name;
- dom_exception err;
-
- err = dom_node_get_node_name(n, &name);
- if (err != DOM_NO_ERR)
- return CSS_OK;
-
- /* Element names are case insensitive in HTML */
- *match = dom_string_caseless_lwc_isequal(name, qname->name);
-
- dom_string_unref(name);
- }
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node has the given class.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param name Name to match
- * \param match Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_has_class(void *pw, void *node,
- lwc_string *name, bool *match)
-{
- dom_node *n = node;
- dom_exception err;
-
- /** \todo: Ensure that libdom performs case-insensitive
- * matching in quirks mode */
- err = dom_element_has_class(n, name, match);
-
- assert(err == DOM_NO_ERR);
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node has the given id.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param name Name to match
- * \param match Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_has_id(void *pw, void *node,
- lwc_string *name, bool *match)
-{
- dom_node *n = node;
- dom_string *attr;
- dom_exception err;
-
- *match = false;
-
- /** \todo Assumes an HTML DOM */
- err = dom_html_element_get_id(n, &attr);
- if (err != DOM_NO_ERR)
- return CSS_OK;
-
- if (attr != NULL) {
- *match = dom_string_lwc_isequal(attr, name);
-
- dom_string_unref(attr);
- }
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node has an attribute with the given name.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param qname Name to match
- * \param match Pointer to location to receive result
- * \return CSS_OK on success,
- * CSS_NOMEM on memory exhaustion.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_has_attribute(void *pw, void *node,
- const css_qname *qname, bool *match)
-{
- dom_node *n = node;
- dom_string *name;
- dom_exception err;
-
- err = dom_string_create_interned(
- (const uint8_t *) lwc_string_data(qname->name),
- lwc_string_length(qname->name), &name);
- if (err != DOM_NO_ERR)
- return CSS_NOMEM;
-
- err = dom_element_has_attribute(n, name, match);
- if (err != DOM_NO_ERR) {
- dom_string_unref(name);
- return CSS_OK;
- }
-
- dom_string_unref(name);
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node has an attribute with given name and value.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param qname Name to match
- * \param value Value to match
- * \param match Pointer to location to receive result
- * \return CSS_OK on success,
- * CSS_NOMEM on memory exhaustion.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_has_attribute_equal(void *pw, void *node,
- const css_qname *qname, lwc_string *value,
- bool *match)
-{
- dom_node *n = node;
- dom_string *name;
- dom_string *atr_val;
- dom_exception err;
-
- size_t vlen = lwc_string_length(value);
-
- if (vlen == 0) {
- *match = false;
- return CSS_OK;
- }
-
- err = dom_string_create_interned(
- (const uint8_t *) lwc_string_data(qname->name),
- lwc_string_length(qname->name), &name);
- if (err != DOM_NO_ERR)
- return CSS_NOMEM;
-
- err = dom_element_get_attribute(n, name, &atr_val);
- if ((err != DOM_NO_ERR) || (atr_val == NULL)) {
- dom_string_unref(name);
- *match = false;
- return CSS_OK;
- }
-
- dom_string_unref(name);
-
- *match = dom_string_caseless_lwc_isequal(atr_val, value);
-
- dom_string_unref(atr_val);
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node has an attribute with the given name whose
- * value dashmatches that given.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param qname Name to match
- * \param value Value to match
- * \param match Pointer to location to receive result
- * \return CSS_OK on success,
- * CSS_NOMEM on memory exhaustion.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_has_attribute_dashmatch(void *pw, void *node,
- const css_qname *qname, lwc_string *value,
- bool *match)
-{
- dom_node *n = node;
- dom_string *name;
- dom_string *atr_val;
- dom_exception err;
-
- size_t vlen = lwc_string_length(value);
-
- if (vlen == 0) {
- *match = false;
- return CSS_OK;
- }
-
- err = dom_string_create_interned(
- (const uint8_t *) lwc_string_data(qname->name),
- lwc_string_length(qname->name), &name);
- if (err != DOM_NO_ERR)
- return CSS_NOMEM;
-
- err = dom_element_get_attribute(n, name, &atr_val);
- if ((err != DOM_NO_ERR) || (atr_val == NULL)) {
- dom_string_unref(name);
- *match = false;
- return CSS_OK;
- }
-
- dom_string_unref(name);
-
- /* check for exact match */
- *match = dom_string_caseless_lwc_isequal(atr_val, value);
-
- /* check for dashmatch */
- if (*match == false) {
- const char *vdata = lwc_string_data(value);
- const char *data = (const char *) dom_string_data(atr_val);
- size_t len = dom_string_byte_length(atr_val);
-
- if (len > vlen && data[vlen] == '-' &&
- strncasecmp(data, vdata, vlen) == 0) {
- *match = true;
- }
- }
-
- dom_string_unref(atr_val);
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node has an attribute with the given name whose
- * value includes that given.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param qname Name to match
- * \param value Value to match
- * \param match Pointer to location to receive result
- * \return CSS_OK on success,
- * CSS_NOMEM on memory exhaustion.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_has_attribute_includes(void *pw, void *node,
- const css_qname *qname, lwc_string *value,
- bool *match)
-{
- dom_node *n = node;
- dom_string *name;
- dom_string *atr_val;
- dom_exception err;
- size_t vlen = lwc_string_length(value);
- const char *p;
- const char *start;
- const char *end;
-
- *match = false;
-
- if (vlen == 0) {
- return CSS_OK;
- }
-
- err = dom_string_create_interned(
- (const uint8_t *) lwc_string_data(qname->name),
- lwc_string_length(qname->name), &name);
- if (err != DOM_NO_ERR)
- return CSS_NOMEM;
-
- err = dom_element_get_attribute(n, name, &atr_val);
- if ((err != DOM_NO_ERR) || (atr_val == NULL)) {
- dom_string_unref(name);
- *match = false;
- return CSS_OK;
- }
-
- dom_string_unref(name);
-
- /* check for match */
- start = (const char *) dom_string_data(atr_val);
- end = start + dom_string_byte_length(atr_val);
-
- for (p = start; p <= end; p++) {
- if (*p == ' ' || *p == '\0') {
- if ((size_t) (p - start) == vlen &&
- strncasecmp(start,
- lwc_string_data(value),
- vlen) == 0) {
- *match = true;
- break;
- }
-
- start = p + 1;
- }
- }
-
- dom_string_unref(atr_val);
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node has an attribute with the given name whose
- * value has the prefix given.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param qname Name to match
- * \param value Value to match
- * \param match Pointer to location to receive result
- * \return CSS_OK on success,
- * CSS_NOMEM on memory exhaustion.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_has_attribute_prefix(void *pw, void *node,
- const css_qname *qname, lwc_string *value,
- bool *match)
-{
- dom_node *n = node;
- dom_string *name;
- dom_string *atr_val;
- dom_exception err;
-
- size_t vlen = lwc_string_length(value);
-
- if (vlen == 0) {
- *match = false;
- return CSS_OK;
- }
-
- err = dom_string_create_interned(
- (const uint8_t *) lwc_string_data(qname->name),
- lwc_string_length(qname->name), &name);
- if (err != DOM_NO_ERR)
- return CSS_NOMEM;
-
- err = dom_element_get_attribute(n, name, &atr_val);
- if ((err != DOM_NO_ERR) || (atr_val == NULL)) {
- dom_string_unref(name);
- *match = false;
- return CSS_OK;
- }
-
- dom_string_unref(name);
-
- /* check for exact match */
- *match = dom_string_caseless_lwc_isequal(atr_val, value);
-
- /* check for prefix match */
- if (*match == false) {
- const char *data = (const char *) dom_string_data(atr_val);
- size_t len = dom_string_byte_length(atr_val);
-
- if ((len >= vlen) &&
- (strncasecmp(data, lwc_string_data(value), vlen) == 0)) {
- *match = true;
- }
- }
-
- dom_string_unref(atr_val);
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node has an attribute with the given name whose
- * value has the suffix given.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param qname Name to match
- * \param value Value to match
- * \param match Pointer to location to receive result
- * \return CSS_OK on success,
- * CSS_NOMEM on memory exhaustion.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_has_attribute_suffix(void *pw, void *node,
- const css_qname *qname, lwc_string *value,
- bool *match)
-{
- dom_node *n = node;
- dom_string *name;
- dom_string *atr_val;
- dom_exception err;
-
- size_t vlen = lwc_string_length(value);
-
- if (vlen == 0) {
- *match = false;
- return CSS_OK;
- }
-
- err = dom_string_create_interned(
- (const uint8_t *) lwc_string_data(qname->name),
- lwc_string_length(qname->name), &name);
- if (err != DOM_NO_ERR)
- return CSS_NOMEM;
-
- err = dom_element_get_attribute(n, name, &atr_val);
- if ((err != DOM_NO_ERR) || (atr_val == NULL)) {
- dom_string_unref(name);
- *match = false;
- return CSS_OK;
- }
-
- dom_string_unref(name);
-
- /* check for exact match */
- *match = dom_string_caseless_lwc_isequal(atr_val, value);
-
- /* check for prefix match */
- if (*match == false) {
- const char *data = (const char *) dom_string_data(atr_val);
- size_t len = dom_string_byte_length(atr_val);
-
- const char *start = (char *) data + len - vlen;
-
- if ((len >= vlen) &&
- (strncasecmp(start, lwc_string_data(value), vlen) == 0)) {
- *match = true;
- }
-
-
- }
-
- dom_string_unref(atr_val);
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node has an attribute with the given name whose
- * value contains the substring given.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param qname Name to match
- * \param value Value to match
- * \param match Pointer to location to receive result
- * \return CSS_OK on success,
- * CSS_NOMEM on memory exhaustion.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_has_attribute_substring(void *pw, void *node,
- const css_qname *qname, lwc_string *value,
- bool *match)
-{
- dom_node *n = node;
- dom_string *name;
- dom_string *atr_val;
- dom_exception err;
-
- size_t vlen = lwc_string_length(value);
-
- if (vlen == 0) {
- *match = false;
- return CSS_OK;
- }
-
- err = dom_string_create_interned(
- (const uint8_t *) lwc_string_data(qname->name),
- lwc_string_length(qname->name), &name);
- if (err != DOM_NO_ERR)
- return CSS_NOMEM;
-
- err = dom_element_get_attribute(n, name, &atr_val);
- if ((err != DOM_NO_ERR) || (atr_val == NULL)) {
- dom_string_unref(name);
- *match = false;
- return CSS_OK;
- }
-
- dom_string_unref(name);
-
- /* check for exact match */
- *match = dom_string_caseless_lwc_isequal(atr_val, value);
-
- /* check for prefix match */
- if (*match == false) {
- const char *vdata = lwc_string_data(value);
- const char *start = (const char *) dom_string_data(atr_val);
- size_t len = dom_string_byte_length(atr_val);
- const char *last_start = start + len - vlen;
-
- if (len >= vlen) {
- while (start <= last_start) {
- if (strncasecmp(start, vdata,
- vlen) == 0) {
- *match = true;
- break;
- }
-
- start++;
- }
- }
- }
-
- dom_string_unref(atr_val);
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node is the root node of the document.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param match Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_is_root(void *pw, void *node, bool *match)
-{
- dom_node *n = node;
- dom_node *parent;
- dom_node_type type;
- dom_exception err;
-
- err = dom_node_get_parent_node(n, &parent);
- if (err != DOM_NO_ERR) {
- return CSS_NOMEM;
- }
-
- if (parent != NULL) {
- err = dom_node_get_node_type(parent, &type);
-
- dom_node_unref(parent);
-
- if (err != DOM_NO_ERR)
- return CSS_NOMEM;
-
- if (type != DOM_DOCUMENT_NODE) {
- *match = false;
- return CSS_OK;
- }
- }
-
- *match = true;
-
- return CSS_OK;
-}
-
-static int
-node_count_siblings_check(dom_node *node,
- bool check_name,
- dom_string *name)
-{
- dom_node_type type;
- int ret = 0;
- dom_exception exc;
-
- if (node == NULL)
- return 0;
-
- exc = dom_node_get_node_type(node, &type);
- if ((exc != DOM_NO_ERR) || (type != DOM_ELEMENT_NODE)) {
- return 0;
- }
-
- if (check_name) {
- dom_string *node_name = NULL;
- exc = dom_node_get_node_name(node, &node_name);
-
- if ((exc == DOM_NO_ERR) && (node_name != NULL)) {
-
- if (dom_string_caseless_isequal(name,
- node_name)) {
- ret = 1;
- }
- dom_string_unref(node_name);
- }
- } else {
- ret = 1;
- }
-
- return ret;
-}
-
-/**
- * Callback to count a node's siblings.
- *
- * \param pw HTML document
- * \param n DOM node
- * \param same_name Only count siblings with the same name, or all
- * \param after Count anteceding instead of preceding siblings
- * \param count Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a count will contain the number of siblings
- */
-css_error node_count_siblings(void *pw, void *n, bool same_name,
- bool after, int32_t *count)
-{
- int32_t cnt = 0;
- dom_exception exc;
- dom_string *node_name = NULL;
-
- if (same_name) {
- dom_node *node = n;
- exc = dom_node_get_node_name(node, &node_name);
- if ((exc != DOM_NO_ERR) || (node_name == NULL)) {
- return CSS_NOMEM;
- }
- }
-
- if (after) {
- dom_node *node = dom_node_ref(n);
- dom_node *next;
-
- do {
- exc = dom_node_get_next_sibling(node, &next);
- if ((exc != DOM_NO_ERR))
- break;
-
- dom_node_unref(node);
- node = next;
-
- cnt += node_count_siblings_check(node, same_name, node_name);
- } while (node != NULL);
- } else {
- dom_node *node = dom_node_ref(n);
- dom_node *next;
-
- do {
- exc = dom_node_get_previous_sibling(node, &next);
- if ((exc != DOM_NO_ERR))
- break;
-
- dom_node_unref(node);
- node = next;
-
- cnt += node_count_siblings_check(node, same_name, node_name);
-
- } while (node != NULL);
- }
-
- if (node_name != NULL) {
- dom_string_unref(node_name);
- }
-
- *count = cnt;
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node is empty.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param match Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a match will contain true if the node is empty and false otherwise.
- */
-css_error node_is_empty(void *pw, void *node, bool *match)
-{
- dom_node *n = node, *next;
- dom_exception err;
-
- *match = true;
-
- err = dom_node_get_first_child(n, &n);
- if (err != DOM_NO_ERR) {
- return CSS_BADPARM;
- }
-
- while (n != NULL) {
- dom_node_type ntype;
- err = dom_node_get_node_type(n, &ntype);
- if (err != DOM_NO_ERR) {
- dom_node_unref(n);
- return CSS_BADPARM;
- }
-
- if (ntype == DOM_ELEMENT_NODE ||
- ntype == DOM_TEXT_NODE) {
- *match = false;
- dom_node_unref(n);
- break;
- }
-
- err = dom_node_get_next_sibling(n, &next);
- if (err != DOM_NO_ERR) {
- dom_node_unref(n);
- return CSS_BADPARM;
- }
- dom_node_unref(n);
- n = next;
- }
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node is a linking element.
- *
- * \param pw HTML document
- * \param n DOM node
- * \param match Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_is_link(void *pw, void *n, bool *match)
-{
- dom_node *node = n;
- dom_exception exc;
- dom_string *node_name = NULL;
-
- exc = dom_node_get_node_name(node, &node_name);
- if ((exc != DOM_NO_ERR) || (node_name == NULL)) {
- return CSS_NOMEM;
- }
-
- if (dom_string_caseless_lwc_isequal(node_name, corestring_lwc_a)) {
- bool has_href;
- exc = dom_element_has_attribute(node, corestring_dom_href,
- &has_href);
- if ((exc == DOM_NO_ERR) && (has_href)) {
- *match = true;
- } else {
- *match = false;
- }
- } else {
- *match = false;
- }
- dom_string_unref(node_name);
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node is a linking element whose target has been
- * visited.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param match Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_is_visited(void *pw, void *node, bool *match)
-{
- nscss_select_ctx *ctx = pw;
- nsurl *url;
- nserror error;
- const struct url_data *data;
-
- dom_exception exc;
- dom_node *n = node;
- dom_string *s = NULL;
-
- *match = false;
-
- exc = dom_node_get_node_name(n, &s);
- if ((exc != DOM_NO_ERR) || (s == NULL)) {
- return CSS_NOMEM;
- }
-
- if (!dom_string_caseless_lwc_isequal(s, corestring_lwc_a)) {
- /* Can't be visited; not ancher element */
- dom_string_unref(s);
- return CSS_OK;
- }
-
- /* Finished with node name string */
- dom_string_unref(s);
- s = NULL;
-
- exc = dom_element_get_attribute(n, corestring_dom_href, &s);
- if ((exc != DOM_NO_ERR) || (s == NULL)) {
- /* Can't be visited; not got a URL */
- return CSS_OK;
- }
-
- /* Make href absolute */
- /* TODO: this duplicates what we do for box->href
- * should we put the absolute URL on the dom node? */
- error = nsurl_join(ctx->base_url, dom_string_data(s), &url);
-
- /* Finished with href string */
- dom_string_unref(s);
-
- if (error != NSERROR_OK) {
- /* Couldn't make nsurl object */
- return CSS_NOMEM;
- }
-
- data = urldb_get_url_data(url);
-
- /* Visited if in the db and has
- * non-zero visit count */
- if (data != NULL && data->visits > 0)
- *match = true;
-
- nsurl_unref(url);
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node is currently being hovered over.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param match Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_is_hover(void *pw, void *node, bool *match)
-{
- /** \todo Support hovering */
-
- *match = false;
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node is currently activated.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param match Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_is_active(void *pw, void *node, bool *match)
-{
- /** \todo Support active nodes */
-
- *match = false;
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node has the input focus.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param match Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_is_focus(void *pw, void *node, bool *match)
-{
- /** \todo Support focussed nodes */
-
- *match = false;
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node is enabled.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param match Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a match with contain true if the node is enabled and false otherwise.
- */
-css_error node_is_enabled(void *pw, void *node, bool *match)
-{
- /** \todo Support enabled nodes */
-
- *match = false;
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node is disabled.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param match Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a match with contain true if the node is disabled and false otherwise.
- */
-css_error node_is_disabled(void *pw, void *node, bool *match)
-{
- /** \todo Support disabled nodes */
-
- *match = false;
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node is checked.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param match Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a match with contain true if the node is checked and false otherwise.
- */
-css_error node_is_checked(void *pw, void *node, bool *match)
-{
- /** \todo Support checked nodes */
-
- *match = false;
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node is the target of the document URL.
- *
- * \param pw HTML document
- * \param node DOM node
- * \param match Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a match with contain true if the node matches and false otherwise.
- */
-css_error node_is_target(void *pw, void *node, bool *match)
-{
- /** \todo Support target */
-
- *match = false;
-
- return CSS_OK;
-}
-
-/**
- * Callback to determine if a node has the given language
- *
- * \param pw HTML document
- * \param node DOM node
- * \param lang Language specifier to match
- * \param match Pointer to location to receive result
- * \return CSS_OK.
- *
- * \post \a match will contain true if the node matches and false otherwise.
- */
-css_error node_is_lang(void *pw, void *node,
- lwc_string *lang, bool *match)
-{
- /** \todo Support languages */
-
- *match = false;
-
- return CSS_OK;
-}
-
-/**
- * Callback to retrieve the User-Agent defaults for a CSS property.
- *
- * \param pw HTML document
- * \param property Property to retrieve defaults for
- * \param hint Pointer to hint object to populate
- * \return CSS_OK on success,
- * CSS_INVALID if the property should not have a user-agent default.
- */
-css_error ua_default_for_property(void *pw, uint32_t property, css_hint *hint)
-{
- if (property == CSS_PROP_COLOR) {
- hint->data.color = 0xff000000;
- hint->status = CSS_COLOR_COLOR;
- } else if (property == CSS_PROP_FONT_FAMILY) {
- hint->data.strings = NULL;
- switch (nsoption_int(font_default)) {
- case PLOT_FONT_FAMILY_SANS_SERIF:
- hint->status = CSS_FONT_FAMILY_SANS_SERIF;
- break;
- case PLOT_FONT_FAMILY_SERIF:
- hint->status = CSS_FONT_FAMILY_SERIF;
- break;
- case PLOT_FONT_FAMILY_MONOSPACE:
- hint->status = CSS_FONT_FAMILY_MONOSPACE;
- break;
- case PLOT_FONT_FAMILY_CURSIVE:
- hint->status = CSS_FONT_FAMILY_CURSIVE;
- break;
- case PLOT_FONT_FAMILY_FANTASY:
- hint->status = CSS_FONT_FAMILY_FANTASY;
- break;
- }
- } else if (property == CSS_PROP_QUOTES) {
- /** \todo Not exactly useful :) */
- hint->data.strings = NULL;
- hint->status = CSS_QUOTES_NONE;
- } else if (property == CSS_PROP_VOICE_FAMILY) {
- /** \todo Fix this when we have voice-family done */
- hint->data.strings = NULL;
- hint->status = 0;
- } else {
- return CSS_INVALID;
- }
-
- return CSS_OK;
-}
-
-css_error set_libcss_node_data(void *pw, void *node, void *libcss_node_data)
-{
- dom_node *n = node;
- dom_exception err;
- void *old_node_data;
-
- /* Set this node's node data */
- err = dom_node_set_user_data(n,
- corestring_dom___ns_key_libcss_node_data,
- libcss_node_data, nscss_dom_user_data_handler,
- (void *) &old_node_data);
- if (err != DOM_NO_ERR) {
- return CSS_NOMEM;
- }
-
- assert(old_node_data == NULL);
-
- return CSS_OK;
-}
-
-css_error get_libcss_node_data(void *pw, void *node, void **libcss_node_data)
-{
- dom_node *n = node;
- dom_exception err;
-
- /* Get this node's node data */
- err = dom_node_get_user_data(n,
- corestring_dom___ns_key_libcss_node_data,
- libcss_node_data);
- if (err != DOM_NO_ERR) {
- return CSS_NOMEM;
- }
-
- return CSS_OK;
-}
diff --git a/css/select.h b/css/select.h
deleted file mode 100644
index 0e0be95..0000000
--- a/css/select.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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 NETSURF_CSS_SELECT_H_
-#define NETSURF_CSS_SELECT_H_
-
-#include <stdint.h>
-
-#include <dom/dom.h>
-
-#include "css/css.h"
-
-struct content;
-struct nsurl;
-
-/**
- * Selection context
- */
-typedef struct nscss_select_ctx
-{
- css_select_ctx *ctx;
- bool quirks;
- struct nsurl *base_url;
- lwc_string *universal;
- const css_computed_style *parent_style;
-} nscss_select_ctx;
-
-css_stylesheet *nscss_create_inline_style(const uint8_t *data, size_t len,
- const char *charset, const char *url, bool allow_quirks);
-
-css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
- uint64_t media, const css_stylesheet *inline_style);
-
-css_computed_style *nscss_get_blank_style(nscss_select_ctx *ctx,
- const css_computed_style *parent);
-
-
-css_error named_ancestor_node(void *pw, void *node,
- const css_qname *qname, void **ancestor);
-css_error node_is_visited(void *pw, void *node, bool *match);
-
-#endif
diff --git a/css/utils.c b/css/utils.c
deleted file mode 100644
index 9bf743c..0000000
--- a/css/utils.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2004 James Bursa <james(a)netsurf-browser.org>
- * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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/>.
- */
-
-#include <assert.h>
-
-#include "css/utils.h"
-
-#include "utils/nsoption.h"
-#include "utils/log.h"
-
-/** Screen DPI in fixed point units: defaults to 90, which RISC OS uses */
-css_fixed nscss_screen_dpi = F_90;
-
-/**
- * Convert an absolute CSS length to points.
- *
- * \param length Length to convert
- * \param unit Corresponding unit
- * \return length in points
- */
-css_fixed nscss_len2pt(css_fixed length, css_unit unit)
-{
- /* Length must not be relative */
- assert(unit != CSS_UNIT_EM && unit != CSS_UNIT_EX);
-
- switch (unit) {
- /* We assume the screen and any other output has the same dpi */
- /* 1in = DPIpx => 1px = (72/DPI)pt */
- case CSS_UNIT_PX: return FDIV(FMUL(length, F_72), nscss_screen_dpi);
- /* 1in = 72pt */
- case CSS_UNIT_IN: return FMUL(length, F_72);
- /* 1in = 2.54cm => 1cm = (72/2.54)pt */
- case CSS_UNIT_CM: return FMUL(length,
- FDIV(F_72, FLTTOFIX(2.54)));
- /* 1in = 25.4mm => 1mm = (72/25.4)pt */
- case CSS_UNIT_MM: return FMUL(length,
- FDIV(F_72, FLTTOFIX(25.4)));
- case CSS_UNIT_PT: return length;
- /* 1pc = 12pt */
- case CSS_UNIT_PC: return FMUL(length, INTTOFIX(12));
- default: break;
- }
-
- return 0;
-}
-
-
-/**
- * Convert a CSS length to pixels.
- *
- * \param length Length to convert
- * \param unit Corresponding unit
- * \param style Computed style applying to length. May be NULL if unit is
- * neither em nor ex
- * \return length in pixels
- */
-css_fixed nscss_len2px(css_fixed length, css_unit unit,
- const css_computed_style *style)
-{
- /* We assume the screen and any other output has the same dpi */
- css_fixed px_per_unit;
-
- assert(style != NULL || (unit != CSS_UNIT_EM && unit != CSS_UNIT_EX));
-
- switch (unit) {
- case CSS_UNIT_EM:
- case CSS_UNIT_EX:
- {
- css_fixed font_size = 0;
- css_unit font_unit = CSS_UNIT_PT;
-
- css_computed_font_size(style, &font_size, &font_unit);
-
- /* Convert to points */
- font_size = nscss_len2pt(font_size, font_unit);
-
- /* Clamp to configured minimum */
- if (font_size < FDIV(INTTOFIX(nsoption_int(font_min_size)), F_10)) {
- font_size = FDIV(INTTOFIX(nsoption_int(font_min_size)), F_10);
- }
-
- /* Convert to pixels (manually, to maximise precision)
- * 1in = 72pt => 1pt = (DPI/72)px */
- px_per_unit = FDIV(FMUL(font_size, nscss_screen_dpi), F_72);
-
- /* Scale ex units: we use a fixed ratio of 1ex = 0.6em */
- if (unit == CSS_UNIT_EX)
- px_per_unit = FMUL(px_per_unit, FLTTOFIX(0.6));
- }
- break;
- case CSS_UNIT_PX:
- px_per_unit = F_1;
- break;
- /* 1in = DPIpx */
- case CSS_UNIT_IN:
- px_per_unit = nscss_screen_dpi;
- break;
- /* 1in = 2.54cm => 1cm = (DPI/2.54)px */
- case CSS_UNIT_CM:
- px_per_unit = FDIV(nscss_screen_dpi, FLTTOFIX(2.54));
- break;
- /* 1in = 25.4mm => 1mm = (DPI/25.4)px */
- case CSS_UNIT_MM:
- px_per_unit = FDIV(nscss_screen_dpi, FLTTOFIX(25.4));
- break;
- /* 1in = 72pt => 1pt = (DPI/72)px */
- case CSS_UNIT_PT:
- px_per_unit = FDIV(nscss_screen_dpi, F_72);
- break;
- /* 1pc = 12pt => 1in = 6pc => 1pc = (DPI/6)px */
- case CSS_UNIT_PC:
- px_per_unit = FDIV(nscss_screen_dpi, INTTOFIX(6));
- break;
- default:
- px_per_unit = 0;
- break;
- }
-
- /* Ensure we round px_per_unit to the nearest whole number of pixels:
- * the use of FIXTOINT() below will truncate. */
- px_per_unit += F_0_5;
-
- /* Calculate total number of pixels */
- return FMUL(length, TRUNCATEFIX(px_per_unit));
-}
-
diff --git a/css/utils.h b/css/utils.h
deleted file mode 100644
index e9650db..0000000
--- a/css/utils.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf 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; version 2 of the License.
- *
- * NetSurf 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 NETSURF_CSS_UTILS_H_
-#define NETSURF_CSS_UTILS_H_
-
-#include "css/css.h"
-#include "desktop/plot_style.h"
-
-/* DPI of the screen, in fixed point units */
-extern css_fixed nscss_screen_dpi;
-
-/**
- * Convert a CSS color to a NetSurf colour primitive
- *
- * ARGB -> (1-A)BGR
- *
- * \param c The CSS color to convert
- * \return Corresponding NetSurf colour primitive
- */
-#define nscss_color_to_ns(c) \
- ( ((~c) & 0xff000000) | \
- ((( c) & 0xff0000 ) >> 16) | \
- (( c) & 0xff00 ) | \
- ((( c) & 0xff ) << 16))
-
-
-/**
- * Convert a NetSurf color to a CSS colour primitive
- *
- * (1-A)BGR -> ARGB
- *
- * \param c The NetSurf color to convert
- * \return Corresponding CSS colour primitive
- */
-#define ns_color_to_nscss(c) \
- ( ((~c) & 0xff000000) | \
- ((( c) & 0xff0000 ) >> 16) | \
- (( c) & 0xff00 ) | \
- ((( c) & 0xff ) << 16))
-
-/**
- * Determine if a CSS color primitive is transparent
- *
- * \param color The CSS color to consider
- * \return True if the color is transparent, false otherwise
- */
-#define nscss_color_is_transparent(color) \
- (((color) >> 24) == 0)
-
-css_fixed nscss_len2pt(css_fixed length, css_unit unit);
-css_fixed nscss_len2px(css_fixed length, css_unit unit,
- const css_computed_style *style);
-
-#endif
diff --git a/desktop/browser.c b/desktop/browser.c
index 4cd017d..2ee36fd 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -52,11 +52,11 @@
#include "content/fetch.h"
#include "content/hlcache.h"
#include "content/urldb.h"
+#include "content/handlers/css/utils.h"
#include "render/form_internal.h"
#include "render/html.h"
#include "render/box.h"
#include "curl/curl.h"
-#include "css/utils.h"
#include "javascript/js.h"
#include "desktop/browser_history.h"
diff --git a/desktop/browser_history.c b/desktop/browser_history.c
index b90884e..b3d12d5 100644
--- a/desktop/browser_history.c
+++ b/desktop/browser_history.c
@@ -34,7 +34,6 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
-#include "css/css.h"
#include "content/handlers/image/bitmap.h"
#include "desktop/gui_layout.h"
diff --git a/desktop/font_haru.c b/desktop/font_haru.c
index d2d7efd..caa751b 100644
--- a/desktop/font_haru.c
+++ b/desktop/font_haru.c
@@ -36,9 +36,6 @@
#include <hpdf.h>
-#include "css/css.h"
-#include "css/utils.h"
-
#include "utils/nsoption.h"
#include "desktop/save_pdf/font_haru.h"
#include "desktop/font.h"
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 440e140..d3d45ca 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -37,7 +37,7 @@
#include "content/hlcache.h"
#include "content/mimesniff.h"
#include "content/urldb.h"
-#include "css/css.h"
+#include "content/handlers/css/css.h"
#include "content/handlers/image/image.h"
#include "content/handlers/image/image_cache.h"
#include "javascript/js.h"
diff --git a/desktop/print.c b/desktop/print.c
index 711e907..c3cfefc 100644
--- a/desktop/print.c
+++ b/desktop/print.c
@@ -32,7 +32,7 @@
#include "utils/talloc.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "css/utils.h"
+#include "content/handlers/css/utils.h"
#include "render/box.h"
#include "desktop/plotters.h"
diff --git a/desktop/print.h b/desktop/print.h
index 5c51981..fb1fd63 100644
--- a/desktop/print.h
+++ b/desktop/print.h
@@ -33,8 +33,7 @@
#define NETSURF_DESKTOP_PRINT_H
#include <stdbool.h>
-
-#include "css/css.h"
+#include <libcss/libcss.h>
struct hlcache_handle;
struct printer;
diff --git a/desktop/save_complete.c b/desktop/save_complete.c
index 98b0304..6f63960 100644
--- a/desktop/save_complete.c
+++ b/desktop/save_complete.c
@@ -41,7 +41,7 @@
#include "utils/messages.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "css/css.h"
+#include "content/handlers/css/css.h"
#include "render/box.h"
#include "render/html.h"
diff --git a/desktop/save_pdf.c b/desktop/save_pdf.c
index 0168d02..40082f2 100644
--- a/desktop/save_pdf.c
+++ b/desktop/save_pdf.c
@@ -44,6 +44,7 @@
*/
#include "utils/config.h"
+#include "utils/errors.h"
#include "desktop/save_pdf.h"
@@ -52,18 +53,18 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
-
#include <hpdf.h>
+#include "utils/log.h"
+#include "utils/utils.h"
+#include "utils/useragent.h"
#include "content/hlcache.h"
#include "utils/nsoption.h"
+#include "content/handlers/image/bitmap.h"
+
#include "desktop/plotters.h"
#include "desktop/print.h"
#include "desktop/printer.h"
-#include "content/handlers/image/bitmap.h"
-#include "utils/log.h"
-#include "utils/utils.h"
-#include "utils/useragent.h"
#include "font_haru.h"
diff --git a/desktop/system_colour.c b/desktop/system_colour.c
index 178c035..f33b57a 100644
--- a/desktop/system_colour.c
+++ b/desktop/system_colour.c
@@ -26,10 +26,10 @@
#include "utils/config.h"
#include "utils/utils.h"
#include "utils/log.h"
-#include "css/utils.h"
-#include "desktop/system_colour.h"
#include "utils/nsoption.h"
+#include "netsurf/css.h"
+#include "desktop/system_colour.h"
#define colour_list_len ((NSOPTION_SYS_COLOUR_END - NSOPTION_SYS_COLOUR_START) + 1)
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 467965d..96a1713 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -26,10 +26,10 @@
#include <stdint.h>
#include <string.h>
-#include "css/utils.h"
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/utils.h"
+#include "content/handlers/css/utils.h"
#include "desktop/browser.h"
#include "desktop/mouse.h"
diff --git a/desktop/tree.c b/desktop/tree.c
index c5bca61..e9a2dfd 100644
--- a/desktop/tree.c
+++ b/desktop/tree.c
@@ -32,7 +32,6 @@
#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "css/utils.h"
#include "utils/nsoption.h"
#include "desktop/browser.h"
diff --git a/desktop/treeview.c b/desktop/treeview.c
index 6b04eac..c12ecd9 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -23,9 +23,9 @@
*/
#include "utils/log.h"
-#include "css/utils.h"
#include "content/handlers/image/bitmap.h"
#include "content/hlcache.h"
+#include "content/handlers/css/utils.h"
#include "desktop/system_colour.h"
#include "desktop/knockout.h"
diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index 23a73f8..fb9c923 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -37,7 +37,7 @@
#include "utils/nsoption.h"
#include "utils/utils.h"
#include "utils/log.h"
-#include "css/utils.h"
+#include "netsurf/css.h"
#include "desktop/mouse.h"
#include "desktop/gui_window.h"
diff --git a/include/netsurf/css.h b/include/netsurf/css.h
new file mode 100644
index 0000000..bd95eae
--- /dev/null
+++ b/include/netsurf/css.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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/>.
+ */
+
+/**
+ * \file
+ * Netsurf core css API
+ */
+
+#ifndef NETSURF_CSS_H_
+#define NETSURF_CSS_H_
+
+/**
+ * Convert a CSS color to a NetSurf colour primitive
+ *
+ * ARGB -> (1-A)BGR
+ *
+ * \param c The CSS color to convert
+ * \return Corresponding NetSurf colour primitive
+ */
+#define nscss_color_to_ns(c) \
+ ( ((~c) & 0xff000000) | \
+ ((( c) & 0xff0000 ) >> 16) | \
+ (( c) & 0xff00 ) | \
+ ((( c) & 0xff ) << 16))
+
+
+/**
+ * Convert a NetSurf color to a CSS colour primitive
+ *
+ * (1-A)BGR -> ARGB
+ *
+ * \param c The NetSurf color to convert
+ * \return Corresponding CSS colour primitive
+ */
+#define ns_color_to_nscss(c) \
+ ( ((~c) & 0xff000000) | \
+ ((( c) & 0xff0000 ) >> 16) | \
+ (( c) & 0xff00 ) | \
+ ((( c) & 0xff ) << 16))
+
+/**
+ * Determine if a CSS color primitive is transparent
+ *
+ * \param color The CSS color to consider
+ * \return True if the color is transparent, false otherwise
+ */
+#define nscss_color_is_transparent(color) \
+ (((color) >> 24) == 0)
+
+#endif
diff --git a/render/box.c b/render/box.c
index bb1800b..07ea114 100644
--- a/render/box.c
+++ b/render/box.c
@@ -35,9 +35,8 @@
#include "utils/utils.h"
#include "content/content_protected.h"
#include "content/hlcache.h"
-#include "css/css.h"
-#include "css/utils.h"
-#include "css/dump.h"
+#include "content/handlers/css/utils.h"
+#include "content/handlers/css/dump.h"
#include "desktop/scrollbar.h"
#include "desktop/gui_misc.h"
#include "desktop/gui_internal.h"
diff --git a/render/box.h b/render/box.h
index 4ac3453..c3f95c2 100644
--- a/render/box.h
+++ b/render/box.h
@@ -89,8 +89,7 @@
#include <limits.h>
#include <stdbool.h>
#include <stdio.h>
-
-#include "css/css.h"
+#include <libcss/libcss.h>
struct content;
struct box;
diff --git a/render/box_construct.c b/render/box_construct.c
index 7e982d7..6dce5c6 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -43,10 +43,9 @@
#include "utils/utils.h"
#include "utils/string.h"
#include "content/content_protected.h"
-#include "css/css.h"
-#include "css/hints.h"
-#include "css/select.h"
-#include "css/utils.h"
+#include "content/handlers/css/hints.h"
+#include "content/handlers/css/select.h"
+#include "netsurf/css.h"
#include "desktop/gui_misc.h"
#include "desktop/gui_internal.h"
diff --git a/render/box_normalise.c b/render/box_normalise.c
index 1010c40..76767a2 100644
--- a/render/box_normalise.c
+++ b/render/box_normalise.c
@@ -26,12 +26,14 @@
#include <assert.h>
#include <stdbool.h>
#include <string.h>
-#include "css/css.h"
-#include "css/select.h"
+
+#include "utils/log.h"
+#include "utils/errors.h"
+#include "content/handlers/css/select.h"
+
#include "render/box.h"
#include "render/html_internal.h"
#include "render/table.h"
-#include "utils/log.h"
/* Define to enable box normalise debug */
#undef BOX_NORMALISE_DEBUG
diff --git a/render/font.c b/render/font.c
index 0b059a2..831097e 100644
--- a/render/font.c
+++ b/render/font.c
@@ -22,9 +22,8 @@
* Renderer internal font handling implementation.
*/
-#include "css/css.h"
-#include "css/utils.h"
#include "utils/nsoption.h"
+#include "content/handlers/css/utils.h"
#include "render/font.h"
diff --git a/render/form.c b/render/form.c
index dce9064..75d16d8 100644
--- a/render/form.c
+++ b/render/form.c
@@ -42,8 +42,7 @@
#include "utils/utils.h"
#include "content/fetch.h"
#include "content/hlcache.h"
-#include "css/css.h"
-#include "css/utils.h"
+#include "content/handlers/css/utils.h"
#include "desktop/browser.h"
#include "desktop/mouse.h"
#include "desktop/knockout.h"
diff --git a/render/html.h b/render/html.h
index ee204d3..215bfbb 100644
--- a/render/html.h
+++ b/render/html.h
@@ -31,7 +31,6 @@
#include <dom/bindings/hubbub/parser.h>
#include "content/content_type.h"
-#include "css/css.h"
#include "desktop/browser.h"
#include "desktop/mouse.h"
#include "desktop/plot_style.h"
diff --git a/render/html_css.c b/render/html_css.c
index 6761a65..0c8ee33 100644
--- a/render/html_css.c
+++ b/render/html_css.c
@@ -28,6 +28,7 @@
#include <stdlib.h>
#include "content/hlcache.h"
+#include "content/handlers/css/css.h"
#include "utils/nsoption.h"
#include "utils/corestrings.h"
#include "utils/config.h"
diff --git a/render/html_internal.h b/render/html_internal.h
index de28726..f0e9815 100644
--- a/render/html_internal.h
+++ b/render/html_internal.h
@@ -16,13 +16,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
+/**
+ * \file
* Content for text/html (private data).
*/
#ifndef NETSURF_RENDER_HTML_INTERNAL_H_
#define NETSURF_RENDER_HTML_INTERNAL_H_
+#include <libcss/libcss.h>
+
#include "content/content_protected.h"
#include "desktop/selection.h"
#include "render/html.h"
diff --git a/render/html_object.c b/render/html_object.c
index 22c9b71..9e5e267 100644
--- a/render/html_object.c
+++ b/render/html_object.c
@@ -33,7 +33,7 @@
#include "utils/log.h"
#include "utils/nsoption.h"
#include "content/hlcache.h"
-#include "css/utils.h"
+#include "content/handlers/css/utils.h"
#include "desktop/scrollbar.h"
#include "desktop/gui_misc.h"
#include "desktop/gui_internal.h"
diff --git a/render/html_redraw.c b/render/html_redraw.c
index 93c136f..7f8391c 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -41,8 +41,7 @@
#include "utils/utils.h"
#include "utils/nsoption.h"
#include "content/content_protected.h"
-#include "css/css.h"
-#include "css/utils.h"
+#include "content/handlers/css/utils.h"
#include "desktop/browser.h"
#include "desktop/plotters.h"
#include "desktop/selection.h"
diff --git a/render/layout.c b/render/layout.c
index e80ec99..a7f2e8d 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -46,10 +46,9 @@
#include "utils/log.h"
#include "utils/talloc.h"
#include "utils/utils.h"
-#include "css/css.h"
-#include "css/utils.h"
-#include "content/content_protected.h"
#include "utils/nsoption.h"
+#include "content/content_protected.h"
+#include "content/handlers/css/utils.h"
#include "desktop/browser.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
diff --git a/render/table.c b/render/table.c
index 6563864..62553ec 100644
--- a/render/table.c
+++ b/render/table.c
@@ -22,15 +22,14 @@
*/
#include <assert.h>
-
#include <dom/dom.h>
-#include "css/css.h"
-#include "css/utils.h"
-#include "render/box.h"
-#include "render/table.h"
#include "utils/log.h"
#include "utils/talloc.h"
+#include "content/handlers/css/utils.h"
+
+#include "render/box.h"
+#include "render/table.h"
/* Define to enable verbose table debug */
#undef TABLE_DEBUG
diff --git a/render/textplain.c b/render/textplain.c
index c825b79..5ecf143 100644
--- a/render/textplain.c
+++ b/render/textplain.c
@@ -39,8 +39,7 @@
#include "utils/utf8.h"
#include "content/content_protected.h"
#include "content/hlcache.h"
-#include "css/css.h"
-#include "css/utils.h"
+#include "content/handlers/css/utils.h"
#include "desktop/browser.h"
#include "utils/nsoption.h"
#include "desktop/plotters.h"
-----------------------------------------------------------------------
Summary of changes:
Docs/Doxyfile | 3 +-
Makefile | 7 +-
content/handlers/Makefile | 7 +-
{css => content/handlers/css}/Makefile | 1 -
{css => content/handlers/css}/css.c | 61 ++++-----
{css => content/handlers/css}/css.h | 20 ++-
{css => content/handlers/css}/dump.c | 201 ++++++++++++++---------------
{css => content/handlers/css}/dump.h | 8 +-
{css => content/handlers/css}/hints.c | 17 +--
{css => content/handlers/css}/hints.h | 12 +-
{css => content/handlers/css}/internal.c | 20 +--
{css => content/handlers/css}/internal.h | 16 ++-
{css => content/handlers/css}/select.c | 82 ++++++------
{css => content/handlers/css}/select.h | 3 +-
{css => content/handlers/css}/utils.c | 43 ++----
css/css.h => content/handlers/css/utils.h | 37 +++---
content/handlers/image/Makefile | 2 +-
content/handlers/image/svg.c | 2 +-
desktop/browser.c | 2 +-
desktop/browser_history.c | 1 -
desktop/font_haru.c | 3 -
desktop/netsurf.c | 2 +-
desktop/print.c | 2 +-
desktop/print.h | 3 +-
desktop/save_complete.c | 2 +-
desktop/save_pdf.c | 11 +-
desktop/system_colour.c | 4 +-
desktop/textarea.c | 2 +-
desktop/tree.c | 1 -
desktop/treeview.c | 2 +-
frontends/amiga/plotters.c | 2 +-
css/utils.h => include/netsurf/css.h | 17 +--
render/box.c | 5 +-
render/box.h | 3 +-
render/box_construct.c | 7 +-
render/box_normalise.c | 8 +-
render/font.c | 3 +-
render/form.c | 3 +-
render/html.h | 1 -
render/html_css.c | 1 +
render/html_internal.h | 5 +-
render/html_object.c | 2 +-
render/html_redraw.c | 3 +-
render/layout.c | 5 +-
render/table.c | 9 +-
render/textplain.c | 3 +-
46 files changed, 313 insertions(+), 341 deletions(-)
rename {css => content/handlers/css}/Makefile (67%)
rename {css => content/handlers/css}/css.c (94%)
copy {css => content/handlers/css}/css.h (73%)
rename {css => content/handlers/css}/dump.c (98%)
rename {css => content/handlers/css}/dump.h (84%)
rename {css => content/handlers/css}/hints.c (99%)
rename {css => content/handlers/css}/hints.h (81%)
rename {css => content/handlers/css}/internal.c (79%)
rename {css => content/handlers/css}/internal.h (65%)
rename {css => content/handlers/css}/select.c (97%)
rename {css => content/handlers/css}/select.h (98%)
rename {css => content/handlers/css}/utils.c (81%)
rename css/css.h => content/handlers/css/utils.h (51%)
rename css/utils.h => include/netsurf/css.h (82%)
diff --git a/Docs/Doxyfile b/Docs/Doxyfile
index 5b8b253..24cc3da 100644
--- a/Docs/Doxyfile
+++ b/Docs/Doxyfile
@@ -672,12 +672,13 @@ INPUT = frontends/amiga \
frontends/riscos/templates \
frontends/riscos/scripts \
frontends/windows \
- css \
+ include/netsurf \
render \
desktop \
content \
content/fetchers \
content/handlers/image \
+ content/handlers/css \
javascript \
javascript/jsapi \
utils \
diff --git a/Makefile b/Makefile
index 35e734e..fe97f1c 100644
--- a/Makefile
+++ b/Makefile
@@ -539,8 +539,8 @@ $(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG))
$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite))
# add top level and build directory to include search path
-CFLAGS += -I. -Ifrontends -I$(OBJROOT)
-CXXFLAGS += -I. -Ifrontends -I$(OBJROOT)
+CFLAGS += -I. -Iinclude -Ifrontends -I$(OBJROOT)
+CXXFLAGS += -I. -Iinclude -Ifrontends -I$(OBJROOT)
# export the user agent format
CFLAGS += -DNETSURF_UA_FORMAT_STRING=\"$(NETSURF_UA_FORMAT_STRING)\"
@@ -585,9 +585,6 @@ include frontends/Makefile
# Content sources
include content/Makefile
-# CSS sources
-include css/Makefile
-
# render sources
include render/Makefile
diff --git a/content/handlers/Makefile b/content/handlers/Makefile
index 97d2813..a12d8cc 100644
--- a/content/handlers/Makefile
+++ b/content/handlers/Makefile
@@ -1,4 +1,9 @@
# Image content handler sources
include content/handlers/image/Makefile
-S_IMAGE := $(addprefix content/handlers/,$(S_IMAGE))
+S_IMAGE := $(addprefix content/handlers/image/,$(S_IMAGE))
+
+# CSS sources
+include content/handlers/css/Makefile
+
+S_CSS := $(addprefix content/handlers/css/,$(S_CSS))
diff --git a/css/Makefile b/content/handlers/css/Makefile
similarity index 67%
rename from css/Makefile
rename to content/handlers/css/Makefile
index 127dbaa..bbfc8d7 100644
--- a/css/Makefile
+++ b/content/handlers/css/Makefile
@@ -2,4 +2,3 @@
S_CSS := css.c dump.c internal.c hints.c select.c utils.c
-S_CSS := $(addprefix css/,$(S_CSS))
diff --git a/css/css.c b/content/handlers/css/css.c
similarity index 94%
rename from css/css.c
rename to content/handlers/css/css.c
index 66dc6d4..4c0cb7a 100644
--- a/css/css.c
+++ b/content/handlers/css/css.c
@@ -30,9 +30,9 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "css/css.h"
-#include "css/hints.h"
-#include "css/internal.h"
+#include "css.h"
+#include "hints.h"
+#include "internal.h"
/* Define to trace import fetches */
#undef NSCSS_IMPORT_TRACE
@@ -76,11 +76,11 @@ typedef struct nscss_content
*/
typedef struct {
struct content_css_data *css; /**< Object containing import */
- uint32_t index; /**< Index into parent sheet's
+ uint32_t index; /**< Index into parent sheet's
* imports array */
} nscss_import_ctx;
-static bool nscss_process_data(struct content *c, const char *data,
+static bool nscss_process_data(struct content *c, const char *data,
unsigned int size);
static bool nscss_convert(struct content *c);
static void nscss_destroy(struct content *c);
@@ -91,13 +91,13 @@ static content_type nscss_content_type(void);
static nserror nscss_create_css_data(struct content_css_data *c,
const char *url, const char *charset, bool quirks,
nscss_done_callback done, void *pw);
-static css_error nscss_process_css_data(struct content_css_data *c, const char *data,
+static css_error nscss_process_css_data(struct content_css_data *c, const char *data,
unsigned int size);
static css_error nscss_convert_css_data(struct content_css_data *c);
static void nscss_destroy_css_data(struct content_css_data *c);
static void nscss_content_done(struct content_css_data *css, void *pw);
-static css_error nscss_handle_import(void *pw, css_stylesheet *parent,
+static css_error nscss_handle_import(void *pw, css_stylesheet *parent,
lwc_string *url, uint64_t media);
static nserror nscss_import(hlcache_handle *handle,
const hlcache_event *event, void *pw);
@@ -151,7 +151,7 @@ nscss_create(const content_handler *handler,
}
/* Find charset specified on HTTP layer, if any */
- error = http_parameter_list_find_item(params, corestring_lwc_charset,
+ error = http_parameter_list_find_item(params, corestring_lwc_charset,
&charset_value);
if (error != NSERROR_OK || lwc_string_length(charset_value) == 0) {
/* No charset specified, use fallback, if any */
@@ -167,8 +167,8 @@ nscss_create(const content_handler *handler,
xnsbase = nsurl_access(content_get_url(&result->base));
}
- error = nscss_create_css_data(&result->data,
- xnsbase, charset, result->base.quirks,
+ error = nscss_create_css_data(&result->data,
+ xnsbase, charset, result->base.quirks,
nscss_content_done, result);
if (error != NSERROR_OK) {
msg_data.error = messages_get("NoMemory");
@@ -273,7 +273,7 @@ bool nscss_process_data(struct content *c, const char *data, unsigned int size)
static css_error nscss_process_css_data(struct content_css_data *c,
const char *data, unsigned int size)
{
- return css_stylesheet_append_data(c->sheet,
+ return css_stylesheet_append_data(c->sheet,
(const uint8_t *) data, size);
}
@@ -316,7 +316,7 @@ static css_error nscss_convert_css_data(struct content_css_data *c)
/* We must not have registered any imports yet */
assert(c->next_to_register == (uint32_t) -1);
- /* Start registering, until we find one that
+ /* Start registering, until we find one that
* hasn't finished fetching */
c->next_to_register = 0;
error = nscss_register_imports(c);
@@ -396,7 +396,7 @@ nserror nscss_clone(const struct content *old, struct content **newc)
/* Simply replay create/process/convert */
error = nscss_create_css_data(&new_css->data,
nsurl_access(content_get_url(&new_css->base)),
- old_css->data.charset,
+ old_css->data.charset,
new_css->base.quirks,
nscss_content_done, new_css);
if (error != NSERROR_OK) {
@@ -430,12 +430,7 @@ bool nscss_matches_quirks(const struct content *c, bool quirks)
return c->quirks == quirks;
}
-/**
- * Retrieve the stylesheet object associated with a CSS content
- *
- * \param h Stylesheet content
- * \return Pointer to stylesheet object
- */
+/* exported interface documented in netsurf/css.h */
css_stylesheet *nscss_get_stylesheet(struct hlcache_handle *h)
{
nscss_content *c = (nscss_content *) hlcache_handle_get_content(h);
@@ -445,13 +440,7 @@ css_stylesheet *nscss_get_stylesheet(struct hlcache_handle *h)
return c->data.sheet;
}
-/**
- * Retrieve imported stylesheets
- *
- * \param h Stylesheet containing imports
- * \param n Pointer to location to receive number of imports
- * \return Pointer to array of imported stylesheets
- */
+/* exported interface documented in netsurf/css.h */
struct nscss_import *nscss_get_imports(hlcache_handle *h, uint32_t *n)
{
nscss_content *c = (nscss_content *) hlcache_handle_get_content(h);
@@ -562,7 +551,7 @@ css_error nscss_handle_import(void *pw, css_stylesheet *parent,
ctx->index = c->import_count;
/* Increase space in table */
- imports = realloc(c->imports, (c->import_count + 1) *
+ imports = realloc(c->imports, (c->import_count + 1) *
sizeof(struct nscss_import));
if (imports == NULL) {
free(ctx);
@@ -710,12 +699,12 @@ css_error nscss_register_imports(struct content_css_data *c)
/* Register imported sheets */
for (index = c->next_to_register; index < c->import_count; index++) {
- /* Stop registering if we encounter one whose fetch hasn't
- * completed yet. We'll resume at this point when it has
+ /* Stop registering if we encounter one whose fetch hasn't
+ * completed yet. We'll resume at this point when it has
* completed.
*/
- if (c->imports[index].c != NULL &&
- content_get_status(c->imports[index].c) !=
+ if (c->imports[index].c != NULL &&
+ content_get_status(c->imports[index].c) !=
CONTENT_STATUS_DONE) {
break;
}
@@ -751,7 +740,7 @@ css_error nscss_register_import(struct content_css_data *c,
css_error error;
if (import != NULL) {
- nscss_content *s =
+ nscss_content *s =
(nscss_content *) hlcache_handle_get_content(import);
sheet = s->data.sheet;
} else {
@@ -822,16 +811,14 @@ static const content_handler css_content_handler = {
.no_share = false,
};
-/**
- * Initialise the CSS content handler
- */
+/* exported interface documented in netsurf/css.h */
nserror nscss_init(void)
{
nserror error;
- error = content_factory_register_handler("text/css",
+ error = content_factory_register_handler("text/css",
&css_content_handler);
- if (error != NSERROR_OK)
+ if (error != NSERROR_OK)
goto error;
error = css_hint_init();
diff --git a/css/css.h b/content/handlers/css/css.h
similarity index 73%
copy from css/css.h
copy to content/handlers/css/css.h
index be8d4bc..4b38829 100644
--- a/css/css.h
+++ b/content/handlers/css/css.h
@@ -35,10 +35,28 @@ struct nscss_import {
uint64_t media; /**< Media types that sheet applies to */
};
+/**
+ * Initialise the CSS content handler
+ *
+ * \return NSERROR_OK on success or error code on faliure
+ */
nserror nscss_init(void);
+/**
+ * Retrieve the stylesheet object associated with a CSS content
+ *
+ * \param h Stylesheet content
+ * \return Pointer to stylesheet object
+ */
css_stylesheet *nscss_get_stylesheet(struct hlcache_handle *h);
+
+/**
+ * Retrieve imported stylesheets
+ *
+ * \param h Stylesheet containing imports
+ * \param n Pointer to location to receive number of imports
+ * \return Pointer to array of imported stylesheets
+ */
struct nscss_import *nscss_get_imports(struct hlcache_handle *h, uint32_t *n);
#endif
-
diff --git a/css/dump.c b/content/handlers/css/dump.c
similarity index 98%
rename from css/dump.c
rename to content/handlers/css/dump.c
index d3ebc94..125b133 100644
--- a/css/dump.c
+++ b/content/handlers/css/dump.c
@@ -17,19 +17,105 @@
*/
#include <stdio.h>
+#include <libcss/libcss.h>
-#include "css/dump.h"
+#include "dump.h"
-static void dump_css_fixed(FILE *stream, css_fixed f);
-static void dump_css_number(FILE *stream, css_fixed val);
-static void dump_css_unit(FILE *stream, css_fixed val, css_unit unit);
+/**
+ * Dump a fixed point value to the stream in a textual form.
+ *
+ * \param stream Stream to write to
+ * \param f Value to write
+ */
+static void dump_css_fixed(FILE *stream, css_fixed f)
+{
+#define NSCSS_ABS(x) (uint32_t)((x) < 0 ? -(x) : (x))
+ uint32_t uintpart = FIXTOINT(NSCSS_ABS(f));
+ /* + 500 to ensure round to nearest (division will truncate) */
+ uint32_t fracpart = ((NSCSS_ABS(f) & 0x3ff) * 1000 + 500) / (1 << 10);
+#undef NSCSS_ABS
+
+ fprintf(stream, "%s%d.%03d", f < 0 ? "-" : "", uintpart, fracpart);
+}
/**
- * Dump a computed style \a style to the give file handle \a stream.
+ * Dump a numeric value to the stream in a textual form.
*
* \param stream Stream to write to
- * \param style Computed style to dump
+ * \param val Value to write
*/
+static void dump_css_number(FILE *stream, css_fixed val)
+{
+ if (INTTOFIX(FIXTOINT(val)) == val)
+ fprintf(stream, "%d", FIXTOINT(val));
+ else
+ dump_css_fixed(stream, val);
+}
+
+/**
+ * Dump a dimension to the stream in a textual form.
+ *
+ * \param stream Stream to write to
+ * \param val Value to write
+ * \param unit Unit to write
+ */
+static void dump_css_unit(FILE *stream, css_fixed val, css_unit unit)
+{
+ dump_css_number(stream, val);
+
+ switch (unit) {
+ case CSS_UNIT_PX:
+ fprintf(stream, "px");
+ break;
+ case CSS_UNIT_EX:
+ fprintf(stream, "ex");
+ break;
+ case CSS_UNIT_EM:
+ fprintf(stream, "em");
+ break;
+ case CSS_UNIT_IN:
+ fprintf(stream, "in");
+ break;
+ case CSS_UNIT_CM:
+ fprintf(stream, "cm");
+ break;
+ case CSS_UNIT_MM:
+ fprintf(stream, "mm");
+ break;
+ case CSS_UNIT_PT:
+ fprintf(stream, "pt");
+ break;
+ case CSS_UNIT_PC:
+ fprintf(stream, "pc");
+ break;
+ case CSS_UNIT_PCT:
+ fprintf(stream, "%%");
+ break;
+ case CSS_UNIT_DEG:
+ fprintf(stream, "deg");
+ break;
+ case CSS_UNIT_GRAD:
+ fprintf(stream, "grad");
+ break;
+ case CSS_UNIT_RAD:
+ fprintf(stream, "rad");
+ break;
+ case CSS_UNIT_MS:
+ fprintf(stream, "ms");
+ break;
+ case CSS_UNIT_S:
+ fprintf(stream, "s");
+ break;
+ case CSS_UNIT_HZ:
+ fprintf(stream, "Hz");
+ break;
+ case CSS_UNIT_KHZ:
+ fprintf(stream, "kHz");
+ break;
+ }
+}
+
+/* exported interface documented in content/handlers/css/dump.h */
void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
{
uint8_t val;
@@ -74,7 +160,7 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
val = css_computed_background_image(style, &url);
if (val == CSS_BACKGROUND_IMAGE_IMAGE && url != NULL) {
fprintf(stream, "background-image: url('%.*s') ",
- (int) lwc_string_length(url),
+ (int) lwc_string_length(url),
lwc_string_data(url));
} else if (val == CSS_BACKGROUND_IMAGE_NONE) {
fprintf(stream, "background-image: none ");
@@ -1008,7 +1094,7 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
val = css_computed_list_style_image(style, &url);
if (url != NULL) {
fprintf(stream, "list-style-image: url('%.*s') ",
- (int) lwc_string_length(url),
+ (int) lwc_string_length(url),
lwc_string_data(url));
} else if (val == CSS_LIST_STYLE_IMAGE_NONE) {
fprintf(stream, "list-style-image: none ");
@@ -1705,102 +1791,3 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
fprintf(stream, "}");
}
-
-/******************************************************************************
- * Helper functions for nscss_dump_computed_style *
- ******************************************************************************/
-
-/**
- * Dump a fixed point value to the stream in a textual form.
- *
- * \param stream Stream to write to
- * \param f Value to write
- */
-void dump_css_fixed(FILE *stream, css_fixed f)
-{
-#define NSCSS_ABS(x) (uint32_t)((x) < 0 ? -(x) : (x))
- uint32_t uintpart = FIXTOINT(NSCSS_ABS(f));
- /* + 500 to ensure round to nearest (division will truncate) */
- uint32_t fracpart = ((NSCSS_ABS(f) & 0x3ff) * 1000 + 500) / (1 &l