From a80a4968bd9fb75964ec45cc1ec95c10d4dd5354 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Wed, 23 Sep 2009 21:52:36 +0000
Subject: fix text cursor positioning some more

svn path=/trunk/netsurf/; revision=9597
---
 amiga/font.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'amiga/font.c')

diff --git a/amiga/font.c b/amiga/font.c
index 0c46350ac..a4ae8f0e9 100644
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -94,7 +94,7 @@ bool nsfont_position_in_string(const plot_font_style_t *fstyle,
 	struct OutlineFont *ofont;
 	struct GlyphMap *glyph;
 	uint32 tx=0,i=0;
-	size_t len,utf8len;
+	size_t len, utf8len = 0;
 	uint8 *utf8;
 	uint32 co = 0;
 	int utf16charlen;
@@ -114,9 +114,6 @@ bool nsfont_position_in_string(const plot_font_style_t *fstyle,
 		else
 			utf16charlen = 2;
 
-		utf8len = utf8_char_byte_length(string);
-		string += utf8len;
-
 		if(ESetInfo(&ofont->olf_EEngine,
 			OT_GlyphCode,*utf16,
 			TAG_END) == OTERR_Success)
@@ -142,10 +139,13 @@ bool nsfont_position_in_string(const plot_font_style_t *fstyle,
 					TAG_END);
 			}
 		}
+
+		utf8len = utf8_char_byte_length(string);
+		string += utf8len;
 		utf16 += utf16charlen;
 	}
 
-	if(co == length)
+	if(co == (length - 1))
 	{
 		*actual_x = tx;
 		co = length;
-- 
cgit v1.2.3