Can't test it atm, but...
> Index: beos/beos_font.h
> ===================================================================
> --- beos/beos_font.h (revision 8625)
> +++ beos/beos_font.h (working copy)
> @@ -22,12 +22,10 @@
>
> #include <stdbool.h>
>
> +#include "desktop/plotters.h"
>
> -struct css_style;
> -
> -bool nsfont_paint(const struct css_style *style,
> +bool nsfont_paint(const plot_font_style_t *fstyle,
> const char *string, size_t length,
> - int x, int y, colour bg, colour c);
> + int x, int y);
...
> Index: beos/beos_plotters.cpp
> ===================================================================
> --- beos/beos_plotters.cpp (revision 8625)
> +++ beos/beos_plotters.cpp (working copy)
[...]
> -bool nsbeos_plot_text(int x, int y, const struct css_style *style,
> - const char *text, size_t length, colour bg, colour c)
> +bool nsbeos_plot_text(int x, int y, const char *text, size_t length,
> + const plot_font_style_t *fstyle)
> {
> - return nsfont_paint(style, text, length, x, y, bg, c);
> + return nsfont_paint(fstyle, text, length, x, y, bg);
> }
...
> Index: beos/beos_font.cpp
> ===================================================================
> --- beos/beos_font.cpp (revision 8625)
> +++ beos/beos_font.cpp (working copy)
[...]
> -bool nsfont_paint(const struct css_style *style,
> +bool nsfont_paint(const plot_font_style_t *fstyle,
> const char *string, size_t length,
> int x, int y, colour bg, colour c)
> {
...
this doesn't look good.
proto gets bg & fg removed, function gets both, and is called with only
one of those.
François.
