mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-19 02:32:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

update monkey frontend to use layout table

Browse Source
This commit is contained in:
Vincent Sanders 2016-04-24 10:23:51 +01:00
parent 922faa743b
commit ae01f36619
4 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/Makefile.target
View File

@ -57,7 +57,7 @@ endif
# S_MONKEY are sources purely for the MONKEY build # 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 \ 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)) S_MONKEY := $(addprefix monkey/,$(S_MONKEY))

37
monkey/font.c → monkey/layout.c
View File

@ -16,16 +16,25 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "utils/nsoption.h" /**
#include "utils/utf8.h" * \file
#include "desktop/font.h" * monkey implementation of font layout.
*/
static bool nsfont_width(const plot_font_style_t *fstyle, #include <stddef.h>
#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, const char *string, size_t length,
int *width) int *width)
{ {
*width = (fstyle->size * utf8_bounded_length(string, length)) / FONT_SIZE_SCALE; *width = (fstyle->size * utf8_bounded_length(string, length)) / FONT_SIZE_SCALE;
return true; return NSERROR_OK;
} }
/** /**
@ -40,7 +49,7 @@ static bool nsfont_width(const plot_font_style_t *fstyle,
* \return true on success, false on error and error reported * \return true on success, false on error and error reported
*/ */
static bool nsfont_position_in_string(const plot_font_style_t *fstyle, static nserror nsfont_position_in_string(const plot_font_style_t *fstyle,
const char *string, size_t length, const char *string, size_t length,
int x, size_t *char_offset, int *actual_x) int x, size_t *char_offset, int *actual_x)
{ {
@ -48,7 +57,7 @@ static bool nsfont_position_in_string(const plot_font_style_t *fstyle,
if (*char_offset > length) if (*char_offset > length)
*char_offset = length; *char_offset = length;
*actual_x = *char_offset * (fstyle->size / FONT_SIZE_SCALE); *actual_x = *char_offset * (fstyle->size / FONT_SIZE_SCALE);
return true; return NSERROR_OK;
} }
@ -75,7 +84,7 @@ static bool nsfont_position_in_string(const plot_font_style_t *fstyle,
* Returning char_offset == length means no split possible * Returning char_offset == length means no split possible
*/ */
static bool nsfont_split(const plot_font_style_t *fstyle, static nserror nsfont_split(const plot_font_style_t *fstyle,
const char *string, size_t length, const char *string, size_t length,
int x, size_t *char_offset, int *actual_x) int x, size_t *char_offset, int *actual_x)
{ {
@ -96,11 +105,13 @@ static bool nsfont_split(const plot_font_style_t *fstyle,
} }
} }
*actual_x = *char_offset * (fstyle->size / FONT_SIZE_SCALE); *actual_x = *char_offset * (fstyle->size / FONT_SIZE_SCALE);
return true; return NSERROR_OK;
} }
const struct font_functions nsfont = { static struct gui_layout_table layout_table = {
nsfont_width, .width = nsfont_width,
nsfont_position_in_string, .position = nsfont_position_in_string,
nsfont_split .split = nsfont_split,
}; };
struct gui_layout_table *monkey_layout_table = &layout_table;

24
monkey/layout.h Normal file
View File

@ -0,0 +1,24 @@
/*
* Copyright 2016 Vincent Sanders <vince@netsurf-browser.org>
*
* 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/>.
*/
#ifndef NS_MONKEY_LAYOUT_H
#define NS_MONKEY_LAYOUT_H
extern struct gui_layout_table *monkey_layout_table;
#endif /* NS_MONKEY_LAYOUT_H */

2
monkey/main.c
View File

@ -44,6 +44,7 @@
#include "monkey/fetch.h" #include "monkey/fetch.h"
#include "monkey/schedule.h" #include "monkey/schedule.h"
#include "monkey/bitmap.h" #include "monkey/bitmap.h"
#include "monkey/layout.h"
/** maximum number of languages in language vector */ /** maximum number of languages in language vector */
#define LANGV_SIZE 32 #define LANGV_SIZE 32
@ -319,6 +320,7 @@ main(int argc, char **argv)
.download = monkey_download_table, .download = monkey_download_table,
.fetch = monkey_fetch_table, .fetch = monkey_fetch_table,
.bitmap = monkey_bitmap_table, .bitmap = monkey_bitmap_table,
.layout = monkey_layout_table,
}; };
ret = netsurf_register(&monkey_table); ret = netsurf_register(&monkey_table);