From ae01f3661938b14b44a907113b6b65c0e3d1721d Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sun, 24 Apr 2016 10:23:51 +0100 Subject: update monkey frontend to use layout table --- monkey/Makefile.target | 2 +- monkey/font.c | 106 -------------------------------------------- monkey/layout.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++ monkey/layout.h | 24 ++++++++++ monkey/main.c | 2 + 5 files changed, 144 insertions(+), 107 deletions(-) delete mode 100644 monkey/font.c create mode 100644 monkey/layout.c create mode 100644 monkey/layout.h (limited to 'monkey') diff --git a/monkey/Makefile.target b/monkey/Makefile.target index 3c7b093af..f03290d22 100644 --- a/monkey/Makefile.target +++ b/monkey/Makefile.target @@ -57,7 +57,7 @@ endif # S_MONKEY are sources purely for the MONKEY build S_MONKEY := main.c utils.c filetype.c schedule.c bitmap.c plot.c browser.c \ - download.c 401login.c cert.c font.c dispatch.c fetch.c + download.c 401login.c cert.c layout.c dispatch.c fetch.c S_MONKEY := $(addprefix monkey/,$(S_MONKEY)) diff --git a/monkey/font.c b/monkey/font.c deleted file mode 100644 index 3b6ca4fdc..000000000 --- a/monkey/font.c +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright 2011 Daniel Silverstone - * - * 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 . - */ - -#include "utils/nsoption.h" -#include "utils/utf8.h" -#include "desktop/font.h" - -static bool nsfont_width(const plot_font_style_t *fstyle, - const char *string, size_t length, - int *width) -{ - *width = (fstyle->size * utf8_bounded_length(string, length)) / FONT_SIZE_SCALE; - return true; -} - -/** - * Find the position in a string where an x coordinate falls. - * - * \param fstyle style for this text - * \param string UTF-8 string to measure - * \param length length of string - * \param x x coordinate to search for - * \param char_offset updated to offset in string of actual_x, [0..length] - * \param actual_x updated to x coordinate of character closest to x - * \return true on success, false on error and error reported - */ - -static bool nsfont_position_in_string(const plot_font_style_t *fstyle, - const char *string, size_t length, - int x, size_t *char_offset, int *actual_x) -{ - *char_offset = x / (fstyle->size / FONT_SIZE_SCALE); - if (*char_offset > length) - *char_offset = length; - *actual_x = *char_offset * (fstyle->size / FONT_SIZE_SCALE); - return true; -} - - -/** - * Find where to split a string to make it fit a width. - * - * \param fstyle style for this text - * \param string UTF-8 string to measure - * \param length length of string, in bytes - * \param x width available - * \param char_offset updated to offset in string of actual_x, [1..length] - * \param actual_x updated to x coordinate of character closest to x - * \return true on success, false on error and error reported - * - * On exit, char_offset indicates first character after split point. - * - * Note: char_offset of 0 should never be returned. - * - * Returns: - * char_offset giving split point closest to x, where actual_x <= x - * else - * char_offset giving split point closest to x, where actual_x > x - * - * Returning char_offset == length means no split possible - */ - -static bool nsfont_split(const plot_font_style_t *fstyle, - const char *string, size_t length, - int x, size_t *char_offset, int *actual_x) -{ - int c_off = *char_offset = x / (fstyle->size / FONT_SIZE_SCALE); - if (*char_offset > length) { - *char_offset = length; - } else { - while (*char_offset > 0) { - if (string[*char_offset] == ' ') - break; - (*char_offset)--; - } - if (*char_offset == 0) { - *char_offset = c_off; - while (*char_offset < length && string[*char_offset] != ' ') { - (*char_offset)++; - } - } - } - *actual_x = *char_offset * (fstyle->size / FONT_SIZE_SCALE); - return true; -} - -const struct font_functions nsfont = { - nsfont_width, - nsfont_position_in_string, - nsfont_split -}; diff --git a/monkey/layout.c b/monkey/layout.c new file mode 100644 index 000000000..401ca158c --- /dev/null +++ b/monkey/layout.c @@ -0,0 +1,117 @@ +/* + * Copyright 2011 Daniel Silverstone + * + * 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 . + */ + +/** + * \file + * monkey implementation of font layout. + */ + +#include + +#include "utils/utf8.h" +#include "desktop/plot_style.h" +#include "desktop/gui_layout.h" + +#include "monkey/layout.h" + +static nserror nsfont_width(const plot_font_style_t *fstyle, + const char *string, size_t length, + int *width) +{ + *width = (fstyle->size * utf8_bounded_length(string, length)) / FONT_SIZE_SCALE; + return NSERROR_OK; +} + +/** + * Find the position in a string where an x coordinate falls. + * + * \param fstyle style for this text + * \param string UTF-8 string to measure + * \param length length of string + * \param x x coordinate to search for + * \param char_offset updated to offset in string of actual_x, [0..length] + * \param actual_x updated to x coordinate of character closest to x + * \return true on success, false on error and error reported + */ + +static nserror nsfont_position_in_string(const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x) +{ + *char_offset = x / (fstyle->size / FONT_SIZE_SCALE); + if (*char_offset > length) + *char_offset = length; + *actual_x = *char_offset * (fstyle->size / FONT_SIZE_SCALE); + return NSERROR_OK; +} + + +/** + * Find where to split a string to make it fit a width. + * + * \param fstyle style for this text + * \param string UTF-8 string to measure + * \param length length of string, in bytes + * \param x width available + * \param char_offset updated to offset in string of actual_x, [1..length] + * \param actual_x updated to x coordinate of character closest to x + * \return true on success, false on error and error reported + * + * On exit, char_offset indicates first character after split point. + * + * Note: char_offset of 0 should never be returned. + * + * Returns: + * char_offset giving split point closest to x, where actual_x <= x + * else + * char_offset giving split point closest to x, where actual_x > x + * + * Returning char_offset == length means no split possible + */ + +static nserror nsfont_split(const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x) +{ + int c_off = *char_offset = x / (fstyle->size / FONT_SIZE_SCALE); + if (*char_offset > length) { + *char_offset = length; + } else { + while (*char_offset > 0) { + if (string[*char_offset] == ' ') + break; + (*char_offset)--; + } + if (*char_offset == 0) { + *char_offset = c_off; + while (*char_offset < length && string[*char_offset] != ' ') { + (*char_offset)++; + } + } + } + *actual_x = *char_offset * (fstyle->size / FONT_SIZE_SCALE); + return NSERROR_OK; +} + +static struct gui_layout_table layout_table = { + .width = nsfont_width, + .position = nsfont_position_in_string, + .split = nsfont_split, +}; + +struct gui_layout_table *monkey_layout_table = &layout_table; diff --git a/monkey/layout.h b/monkey/layout.h new file mode 100644 index 000000000..1e713c27f --- /dev/null +++ b/monkey/layout.h @@ -0,0 +1,24 @@ +/* + * Copyright 2016 Vincent Sanders + * + * 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 . + */ + +#ifndef NS_MONKEY_LAYOUT_H +#define NS_MONKEY_LAYOUT_H + +extern struct gui_layout_table *monkey_layout_table; + +#endif /* NS_MONKEY_LAYOUT_H */ diff --git a/monkey/main.c b/monkey/main.c index 526488e9e..f7d6609c5 100644 --- a/monkey/main.c +++ b/monkey/main.c @@ -44,6 +44,7 @@ #include "monkey/fetch.h" #include "monkey/schedule.h" #include "monkey/bitmap.h" +#include "monkey/layout.h" /** maximum number of languages in language vector */ #define LANGV_SIZE 32 @@ -319,6 +320,7 @@ main(int argc, char **argv) .download = monkey_download_table, .fetch = monkey_fetch_table, .bitmap = monkey_bitmap_table, + .layout = monkey_layout_table, }; ret = netsurf_register(&monkey_table); -- cgit v1.2.3