[project @ 2004-07-05 20:19:51 by joty]

Using UTF-8 instead of Latin1 encoding.

svn path=/import/netsurf/; revision=1049

1 files changed, 28 insertions, 9 deletions

diff --git a/render/font.h b/render/font.h
index 9e76cfdcf..667b177e0 100644
--- a/render/font.h
+++ b/render/font.h
@@ -4,6 +4,7 @@
  *                http://www.opensource.org/licenses/gpl-license
  * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
  * Copyright 2003 James Bursa <bursa@users.sourceforge.net>
+ * Copyright 2004 John Tytgat <John.Tytgat@aaug.net>
  */
 
 #ifndef _NETSURF_RENDER_FONT_H_
@@ -11,22 +12,40 @@
 
 #include "netsurf/css/css.h"
 
+typedef enum {
+	FONTTYPE_UFONT,
+	FONTTYPE_STANDARD_UTF8ENC,
+	FONTTYPE_STANDARD_LATIN1
+} fonttype_e;
+
 struct font_data {
-        int id;
+	int id;
 	int handle;
+	fonttype_e ftype;
 	unsigned int size;
 	unsigned int space_width;
 	struct font_data *next;
 };
 
-struct font_set *font_new_set(void);
-struct font_data *font_open(struct font_set *set, struct css_style *style);
-void font_free_set(struct font_set *set);
-unsigned long font_width(struct font_data *font, const char * text, unsigned int length);
-void font_position_in_string(const char* text, struct font_data *font,
-		unsigned int length, unsigned long x, int* char_offset, int* pixel_offset);
-char * font_split(struct font_data *data, const char * text, unsigned int length,
+struct font_set *nsfont_new_set(void);
+struct font_data *nsfont_open(struct font_set *set, struct css_style *style);
+void nsfont_free_set(struct font_set *set);
+unsigned long nsfont_width(struct font_data *font, const char *text,
+		unsigned int length);
+void nsfont_position_in_string(struct font_data *font, const char *text,
+		unsigned int length, unsigned long x, int *char_offset,
+		int *pixel_offset);
+char *nsfont_split(struct font_data *font, const char *text,
+		unsigned int length,
 		unsigned int width, unsigned int *used_width);
-const char *enumerate_fonts(struct font_set *set, int *handle);
+void nsfont_paint(struct font_data *font, const char *str,
+		int xpos, int ypos, void *trfm, int length);
+void nsfont_txtenum(struct font_data *font, const char *text,
+		unsigned int length,
+		unsigned int *width,
+		const char **rofontname,
+		const char **rotext,
+		unsigned int *rolength,
+		unsigned int *consumed);
 
 #endif