Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/3834770f11e60407f25b3... ...commit http://git.netsurf-browser.org/netsurf.git/commit/3834770f11e60407f25b346... ...tree http://git.netsurf-browser.org/netsurf.git/tree/3834770f11e60407f25b3466c... The branch, master has been updated via 3834770f11e60407f25b3466c8ac9ec921d46d5d (commit) from 54fcb66d876420d6a9158ecd70854739f22f159b (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=3834770f11e60407f25... commit 3834770f11e60407f25b3466c8ac9ec921d46d5d Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; add riscos font header diff --git a/riscos/font.h b/riscos/font.h new file mode 100644 index 0000000..4a1fe4c --- /dev/null +++ b/riscos/font.h @@ -0,0 +1,43 @@ +/* + * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org&gt; + * + * 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 riscos/font.h + * RISC OS font interface. + */ + +#ifndef _NETSURF_RISCOS_FONT_H_ +#define _NETSURF_RISCOS_FONT_H_ + +#include <rufl.h> + +/** desktop font, size and style being used */ +extern char ro_gui_desktop_font_family[]; +extern int ro_gui_desktop_font_size; +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, + size_t length, int x, int y); +void nsfont_read_style(const plot_font_style_t *fstyle, + const char **font_family, unsigned int *font_size, + rufl_style *font_style); +void ro_gui_wimp_get_desktop_font(void); + +#endif ----------------------------------------------------------------------- Summary of changes: framebuffer/fetch.h => riscos/font.h | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) copy framebuffer/fetch.h => riscos/font.h (51%) diff --git a/framebuffer/fetch.h b/riscos/font.h similarity index 51% copy from framebuffer/fetch.h copy to riscos/font.h index 718b083..4a1fe4c 100644 --- a/framebuffer/fetch.h +++ b/riscos/font.h @@ -16,10 +16,28 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>;. */ +/** \file riscos/font.h + * RISC OS font interface. + */ + +#ifndef _NETSURF_RISCOS_FONT_H_ +#define _NETSURF_RISCOS_FONT_H_ + +#include <rufl.h> -#ifndef NETSURF_FB_FETCH_H -#define NETSURF_FB_FETCH_H +/** desktop font, size and style being used */ +extern char ro_gui_desktop_font_family[]; +extern int ro_gui_desktop_font_size; +extern rufl_style ro_gui_desktop_font_style; -struct gui_fetch_table *framebuffer_fetch_table; +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, + size_t length, int x, int y); +void nsfont_read_style(const plot_font_style_t *fstyle, + const char **font_family, unsigned int *font_size, + rufl_style *font_style); +void ro_gui_wimp_get_desktop_font(void); #endif -- NetSurf Browser