diff options
author | Rob Kendrick <rjek@netsurf-browser.org> | 2006-03-19 19:03:07 +0000 |
---|---|---|
committer | Rob Kendrick <rjek@netsurf-browser.org> | 2006-03-19 19:03:07 +0000 |
commit | 1562dd03cbfe225670820e11c6d85f90b670dc52 (patch) | |
tree | 33cc840ced84dd9434987e993f73e5d104b934f4 /riscos | |
parent | 35bb5f96d5daedc961ea887b58bd839b13e8e740 (diff) | |
download | netsurf-1562dd03cbfe225670820e11c6d85f90b670dc52.tar.gz netsurf-1562dd03cbfe225670820e11c6d85f90b670dc52.tar.bz2 |
[project @ 2006-03-19 19:03:07 by rjek]
Implemented unfilled disc plotting and GTK disc plotting
svn path=/import/netsurf/; revision=2136
Diffstat (limited to 'riscos')
-rw-r--r-- | riscos/plotters.c | 11 | ||||
-rw-r--r-- | riscos/print.c | 5 |
2 files changed, 11 insertions, 5 deletions
diff --git a/riscos/plotters.c b/riscos/plotters.c index dcce28c38..4f3decb37 100644 --- a/riscos/plotters.c +++ b/riscos/plotters.c @@ -33,7 +33,7 @@ static bool ro_plot_clip(int clip_x0, int clip_y0, int clip_x1, int clip_y1); static bool ro_plot_text(int x, int y, struct css_style *style, const char *text, size_t length, colour bg, colour c); -static bool ro_plot_disc(int x, int y, int radius, colour colour); +static bool ro_plot_disc(int x, int y, int radius, colour colour, bool filled); static bool ro_plot_bitmap(int x, int y, int width, int height, struct bitmap *bitmap, colour bg); static bool ro_plot_bitmap_tile(int x, int y, int width, int height, @@ -286,7 +286,7 @@ bool ro_plot_text(int x, int y, struct css_style *style, } -bool ro_plot_disc(int x, int y, int radius, colour colour) +bool ro_plot_disc(int x, int y, int radius, colour colour, bool filled) { os_error *error; @@ -304,7 +304,12 @@ bool ro_plot_disc(int x, int y, int radius, colour colour) LOG(("xos_plot: 0x%x: %s", error->errnum, error->errmess)); return false; } - error = xos_plot(os_PLOT_CIRCLE | os_PLOT_BY, radius * 2, 0); + if (filled) { + error = xos_plot(os_PLOT_CIRCLE | os_PLOT_BY, radius * 2, 0); + } else { + error = xos_plot(os_PLOT_CIRCLE_OUTLINE | os_PLOT_BY, + radius * 2, 0); + } if (error) { LOG(("xos_plot: 0x%x: %s", error->errnum, error->errmess)); return false; diff --git a/riscos/print.c b/riscos/print.c index f06a43a46..21b3a511b 100644 --- a/riscos/print.c +++ b/riscos/print.c @@ -97,7 +97,8 @@ static bool print_fonts_plot_clip(int clip_x0, int clip_y0, int clip_x1, int clip_y1); static bool print_fonts_plot_text(int x, int y, struct css_style *style, const char *text, size_t length, colour bg, colour c); -static bool print_fonts_plot_disc(int x, int y, int radius, colour colour); +static bool print_fonts_plot_disc(int x, int y, int radius, colour c, + bool filled); static bool print_fonts_plot_bitmap(int x, int y, int width, int height, struct bitmap *bitmap, colour bg); static bool print_fonts_plot_bitmap_tile(int x, int y, int width, int height, @@ -808,7 +809,7 @@ bool print_fonts_plot_fill(int x0, int y0, int x1, int y1, colour c) { return true; } bool print_fonts_plot_clip(int clip_x0, int clip_y0, int clip_x1, int clip_y1) { return true; } -bool print_fonts_plot_disc(int x, int y, int radius, colour colour) +bool print_fonts_plot_disc(int x, int y, int radius, colour colour, bool filled) { return true; } bool print_fonts_plot_bitmap(int x, int y, int width, int height, struct bitmap *bitmap, colour bg) { return true; } |