diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-14 19:58:54 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-14 19:58:54 +0000 |
commit | 9f10babe645fe67b02fae90f852d5e4cdfcbb70e (patch) | |
tree | 909b77e3c48418204a23ac4723684ca0bc76a081 /frontends/riscos | |
parent | 0d9023148d2a34bd908aac38e44d449359b03438 (diff) | |
parent | 7dab7cb43d4091648ceb40684ff70aff7091c648 (diff) | |
download | netsurf-9f10babe645fe67b02fae90f852d5e4cdfcbb70e.tar.gz netsurf-9f10babe645fe67b02fae90f852d5e4cdfcbb70e.tar.bz2 |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/menuclass
Diffstat (limited to 'frontends/riscos')
-rw-r--r-- | frontends/riscos/configure/con_fonts.c | 2 | ||||
-rw-r--r-- | frontends/riscos/font.c | 1 | ||||
-rw-r--r-- | frontends/riscos/font.h | 5 | ||||
-rw-r--r-- | frontends/riscos/image.h | 2 | ||||
-rw-r--r-- | frontends/riscos/templates/de | 2 | ||||
-rw-r--r-- | frontends/riscos/templates/en | 2 | ||||
-rw-r--r-- | frontends/riscos/templates/fr | 2 | ||||
-rw-r--r-- | frontends/riscos/templates/nl | 2 |
8 files changed, 10 insertions, 8 deletions
diff --git a/frontends/riscos/configure/con_fonts.c b/frontends/riscos/configure/con_fonts.c index 280312843..ecbf396c2 100644 --- a/frontends/riscos/configure/con_fonts.c +++ b/frontends/riscos/configure/con_fonts.c @@ -21,7 +21,7 @@ #include "utils/nsoption.h" #include "utils/messages.h" -#include "desktop/plot_style.h" +#include "netsurf/plot_style.h" #include "riscos/gui.h" #include "riscos/font.h" diff --git a/frontends/riscos/font.c b/frontends/riscos/font.c index a7a394e2d..560afc785 100644 --- a/frontends/riscos/font.c +++ b/frontends/riscos/font.c @@ -35,6 +35,7 @@ #include "utils/messages.h" #include "utils/utils.h" #include "netsurf/layout.h" +#include "netsurf/plot_style.h" #include "riscos/gui.h" #include "riscos/font.h" diff --git a/frontends/riscos/font.h b/frontends/riscos/font.h index 0319a7ee3..a29bad83a 100644 --- a/frontends/riscos/font.h +++ b/frontends/riscos/font.h @@ -25,6 +25,7 @@ #include <rufl.h> +struct plot_font_style; struct gui_layout_table *riscos_layout_table; /** desktop font, size and style being used */ @@ -35,9 +36,9 @@ extern rufl_style ro_gui_desktop_font_style; void nsfont_init(void); bool nsfont_exists(const char *font_family); const char *nsfont_fallback_font(void); -bool nsfont_paint(const plot_font_style_t *fstyle, const char *string, +bool nsfont_paint(const struct plot_font_style *fstyle, const char *string, size_t length, int x, int y); -void nsfont_read_style(const plot_font_style_t *fstyle, +void nsfont_read_style(const struct plot_font_style *fstyle, const char **font_family, unsigned int *font_size, rufl_style *font_style); void ro_gui_wimp_get_desktop_font(void); diff --git a/frontends/riscos/image.h b/frontends/riscos/image.h index a11388c13..2ed3e180d 100644 --- a/frontends/riscos/image.h +++ b/frontends/riscos/image.h @@ -20,7 +20,7 @@ #define _NETSURF_RISCOS_IMAGE_H_ #include <stdbool.h> -#include "desktop/plot_style.h" +#include "netsurf/types.h" #include "oslib/osspriteop.h" struct osspriteop_area; diff --git a/frontends/riscos/templates/de b/frontends/riscos/templates/de index 0fb4a9de7..a4ec1f4ad 100644 --- a/frontends/riscos/templates/de +++ b/frontends/riscos/templates/de @@ -2542,7 +2542,7 @@ wimp_window { xscroll:0 yscroll:0 next:wimp_TOP - window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_HSCROLL | wimp_WINDOW_NEW_FORMAT + window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_HSCROLL | wimp_WINDOW_NEW_FORMAT | wimp_WINDOW_NO_BOUNDS title_fg:wimp_COLOUR_BLACK title_bg:wimp_COLOUR_LIGHT_GREY work_fg:wimp_COLOUR_BLACK diff --git a/frontends/riscos/templates/en b/frontends/riscos/templates/en index 7746b86cc..25be55f5a 100644 --- a/frontends/riscos/templates/en +++ b/frontends/riscos/templates/en @@ -2750,7 +2750,7 @@ wimp_window { xscroll:0 yscroll:0 next:wimp_TOP - window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_HSCROLL | wimp_WINDOW_NEW_FORMAT + window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_HSCROLL | wimp_WINDOW_NEW_FORMAT | wimp_WINDOW_NO_BOUNDS title_fg:wimp_COLOUR_BLACK title_bg:wimp_COLOUR_LIGHT_GREY work_fg:wimp_COLOUR_BLACK diff --git a/frontends/riscos/templates/fr b/frontends/riscos/templates/fr index 67792642c..fafe0cec1 100644 --- a/frontends/riscos/templates/fr +++ b/frontends/riscos/templates/fr @@ -2554,7 +2554,7 @@ wimp_window { xscroll:0 yscroll:0 next:wimp_TOP - window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_HSCROLL | wimp_WINDOW_NEW_FORMAT + window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_HSCROLL | wimp_WINDOW_NEW_FORMAT | wimp_WINDOW_NO_BOUNDS title_fg:wimp_COLOUR_BLACK title_bg:wimp_COLOUR_LIGHT_GREY work_fg:wimp_COLOUR_BLACK diff --git a/frontends/riscos/templates/nl b/frontends/riscos/templates/nl index 704206fbd..5ed9cac1b 100644 --- a/frontends/riscos/templates/nl +++ b/frontends/riscos/templates/nl @@ -2796,7 +2796,7 @@ wimp_window { xscroll:0 yscroll:0 next:wimp_TOP - window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_HSCROLL | wimp_WINDOW_NEW_FORMAT + window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_HSCROLL | wimp_WINDOW_NEW_FORMAT | wimp_WINDOW_NO_BOUNDS title_fg:wimp_COLOUR_BLACK title_bg:wimp_COLOUR_LIGHT_GREY work_fg:wimp_COLOUR_BLACK |