summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-04-24 10:23:51 +0100
committerVincent Sanders <vince@kyllikki.org>2016-04-24 10:23:51 +0100
commitae01f3661938b14b44a907113b6b65c0e3d1721d (patch)
tree2a840d3a142e85587ba4f9860c203ad9322c0c84
parent922faa743b16fcfe661d18be9efcaf329186fbe9 (diff)
downloadnetsurf-ae01f3661938b14b44a907113b6b65c0e3d1721d.tar.gz
netsurf-ae01f3661938b14b44a907113b6b65c0e3d1721d.tar.bz2
update monkey frontend to use layout table
-rw-r--r--monkey/Makefile.target2
-rw-r--r--monkey/layout.c (renamed from monkey/font.c)35
-rw-r--r--monkey/layout.h24
-rw-r--r--monkey/main.c2
4 files changed, 50 insertions, 13 deletions
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/layout.c
index 3b6ca4fdc..401ca158c 100644
--- a/monkey/font.c
+++ b/monkey/layout.c
@@ -16,16 +16,25 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "utils/nsoption.h"
+/**
+ * \file
+ * monkey implementation of font layout.
+ */
+
+#include <stddef.h>
+
#include "utils/utf8.h"
-#include "desktop/font.h"
+#include "desktop/plot_style.h"
+#include "desktop/gui_layout.h"
+
+#include "monkey/layout.h"
-static bool nsfont_width(const plot_font_style_t *fstyle,
+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 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
*/
-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,
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)
*char_offset = length;
*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
*/
-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,
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);
- return true;
+ return NSERROR_OK;
}
-const struct font_functions nsfont = {
- nsfont_width,
- nsfont_position_in_string,
- nsfont_split
+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 <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 */
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);