From 0f43b2327063af238ab1eb5f94c3235f4c9347f6 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 9 Feb 2017 09:56:37 +0000 Subject: update monkey plotters to new API --- frontends/monkey/plot.c | 258 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 213 insertions(+), 45 deletions(-) (limited to 'frontends') diff --git a/frontends/monkey/plot.c b/frontends/monkey/plot.c index bd94e7551..9eb40acba 100644 --- a/frontends/monkey/plot.c +++ b/frontends/monkey/plot.c @@ -19,82 +19,250 @@ #include #include "utils/utils.h" +#include "utils/errors.h" #include "netsurf/plotters.h" -static bool -monkey_plot_disc(int x, int y, int radius, const plot_style_t *style) +/** + * \brief Sets a clip rectangle for subsequent plot operations. + * + * \param ctx The current redraw context. + * \param clip The rectangle to limit all subsequent plot + * operations within. + * \return NSERROR_OK on success else error code. + */ +static nserror +monkey_plot_clip(const struct redraw_context *ctx, const struct rect *clip) { - return true; + fprintf(stdout, + "PLOT CLIP X0 %d Y0 %d X1 %d Y1 %d\n", + clip->x0, clip->y0, clip->x1, clip->y1); + return NSERROR_OK; } -static bool -monkey_plot_arc(int x, int y, int radius, int angle1, int angle2, const plot_style_t *style) + +/** + * Plots an arc + * + * plot an arc segment around (x,y), anticlockwise from angle1 + * to angle2. Angles are measured anticlockwise from + * horizontal, in degrees. + * + * \param ctx The current redraw context. + * \param pstyle Style controlling the arc plot. + * \param x The x coordinate of the arc. + * \param y The y coordinate of the arc. + * \param radius The radius of the arc. + * \param angle1 The start angle of the arc. + * \param angle2 The finish angle of the arc. + * \return NSERROR_OK on success else error code. + */ +static nserror +monkey_plot_arc(const struct redraw_context *ctx, + const plot_style_t *style, + int x, int y, int radius, int angle1, int angle2) { - return true; + fprintf(stdout, + "PLOT ARC X %d Y %d RADIUS %d ANGLE1 %d ANGLE2 %d\n", + x, y, radius, angle1, angle2); + return NSERROR_OK; } -static bool -monkey_plot_polygon(const int *p, unsigned int n, const plot_style_t *style) + +/** + * Plots a circle + * + * Plot a circle centered on (x,y), which is optionally filled. + * + * \param ctx The current redraw context. + * \param pstyle Style controlling the circle plot. + * \param x x coordinate of circle centre. + * \param y y coordinate of circle centre. + * \param radius circle radius. + * \return NSERROR_OK on success else error code. + */ +static nserror +monkey_plot_disc(const struct redraw_context *ctx, + const plot_style_t *style, + int x, int y, int radius) { - return true; + fprintf(stdout, + "PLOT DISC X %d Y %d RADIUS %d\n", + x, y, radius); + return NSERROR_OK; } -static bool -monkey_plot_text(int x, int y, const char *text, size_t length, - const plot_font_style_t *fstyle) +/** + * Plots a line + * + * plot a line from (x0,y0) to (x1,y1). Coordinates are at + * centre of line width/thickness. + * + * \param ctx The current redraw context. + * \param pstyle Style controlling the line plot. + * \param line A rectangle defining the line to be drawn + * \return NSERROR_OK on success else error code. + */ +static nserror +monkey_plot_line(const struct redraw_context *ctx, + const plot_style_t *style, + const struct rect *line) { - fprintf(stdout, "PLOT TEXT X %d Y %d STR %*s\n", x, y, (int)length, text); - return true; + fprintf(stdout, + "PLOT LINE X0 %d Y0 %d X1 %d Y1 %d\n", + line->x0, line->y0, line->x1, line->y1); + return NSERROR_OK; } -static bool -monkey_plot_bitmap(int x, int y, - int width, int height, - struct bitmap *bitmap, colour bg, - bitmap_flags_t flags) + +/** + * Plots a rectangle. + * + * The rectangle can be filled an outline or both controlled + * by the plot style The line can be solid, dotted or + * dashed. Top left corner at (x0,y0) and rectangle has given + * width and height. + * + * \param ctx The current redraw context. + * \param pstyle Style controlling the rectangle plot. + * \param rect A rectangle defining the line to be drawn + * \return NSERROR_OK on success else error code. + */ +static nserror +monkey_plot_rectangle(const struct redraw_context *ctx, + const plot_style_t *style, + const struct rect *rect) { - fprintf(stdout, "PLOT BITMAP X %d Y %d WIDTH %d HEIGHT %d\n", - x, y, width, height); - return true; + fprintf(stdout, + "PLOT RECT X0 %d Y0 %d X1 %d Y1 %d\n", + rect->x0, rect->y0, rect->x1, rect->y1); + return NSERROR_OK; } -static bool -monkey_plot_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style) + +/** + * Plot a 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. + * + * \param ctx The current redraw context. + * \param pstyle Style controlling the polygon plot. + * \param p verticies of polygon + * \param n number of verticies. + * \return NSERROR_OK on success else error code. + */ +static nserror +monkey_plot_polygon(const struct redraw_context *ctx, + const plot_style_t *style, + const int *p, + unsigned int n) { - fprintf(stdout, "PLOT RECT X0 %d Y0 %d X1 %d Y1 %d\n", - x0, y0, x1, y1); - return true; + fprintf(stdout, + "PLOT POLYGON VERTICIES %d\n", + n); + return NSERROR_OK; } -static bool -monkey_plot_line(int x0, int y0, int x1, int y1, const plot_style_t *style) + +/** + * Plots a path. + * + * Path plot consisting of cubic Bezier curves. Line and fill colour is + * controlled by the plot style. + * + * \param ctx The current redraw context. + * \param pstyle Style controlling the path plot. + * \param p elements of path + * \param n nunber of elements on path + * \param width The width of the path + * \param transform A transform to apply to the path. + * \return NSERROR_OK on success else error code. + */ +static nserror +monkey_plot_path(const struct redraw_context *ctx, + const plot_style_t *pstyle, + const float *p, + unsigned int n, + float width, + const float transform[6]) { - fprintf(stdout, "PLOT LINE X0 %d Y0 %d X1 %d Y1 %d\n", - x0, y0, x1, y1); - return true; + fprintf(stdout, + "PLOT PATH VERTICIES %d WIDTH %f\n", + n, width); + return NSERROR_OK; } -static bool -monkey_plot_path(const float *p, - unsigned int n, - colour fill, - float width, - colour c, - const float transform[6]) +/** + * Plot a 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. + * + * \param ctx The current redraw context. + * \param bitmap The bitmap to plot + * \param x The x coordinate to plot the bitmap + * \param y The y coordiante to plot the bitmap + * \param width The width of area to plot the bitmap into + * \param height The height of area to plot the bitmap into + * \param bg the background colour to alpha blend into + * \param flags the flags controlling the type of plot operation + * \return NSERROR_OK on success else error code. + */ +static nserror +monkey_plot_bitmap(const struct redraw_context *ctx, + struct bitmap *bitmap, + int x, int y, + int width, + int height, + colour bg, + bitmap_flags_t flags) { - return true; + fprintf(stdout, + "PLOT BITMAP X %d Y %d WIDTH %d HEIGHT %d\n", + x, y, width, height); + return NSERROR_OK; } -static bool -monkey_plot_clip(const struct rect *clip) + +/** + * Text plotting. + * + * \param ctx The current redraw context. + * \param fstyle plot style for this text + * \param x x coordinate + * \param y y coordinate + * \param text UTF-8 string to plot + * \param length length of string, in bytes + * \return NSERROR_OK on success else error code. + */ +static nserror +monkey_plot_text(const struct redraw_context *ctx, + const struct plot_font_style *fstyle, + int x, + int y, + const char *text, + size_t length) { - fprintf(stdout, "PLOT CLIP X0 %d Y0 %d X1 %d Y1 %d\n", - clip->x0, clip->y0, clip->x1, clip->y1); - return true; + fprintf(stdout, + "PLOT TEXT X %d Y %d STR %*s\n", + x, y, (int)length, text); + return NSERROR_OK; } + +/** monkey plotter operations table */ static const struct plotter_table plotters = { .clip = monkey_plot_clip, .arc = monkey_plot_arc, -- cgit v1.2.3