From 8ca0bfcbb0fe4a5a930cde622695b04cc0397e9a Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Wed, 3 Nov 2004 09:33:55 +0000
Subject: [PATCH] ifdeffed out some code in OffsetAt(), and added some simpler
 (and hopefully more correct) code, to handle multi byte charachters correctly
 when selecting via mouse.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9757 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/interface/BTextView/TextView.cpp | 32 ++++++++++++++++++-----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/kits/interface/BTextView/TextView.cpp b/src/kits/interface/BTextView/TextView.cpp
index cda705a79b..7aebcd7799 100644
--- a/src/kits/interface/BTextView/TextView.cpp
+++ b/src/kits/interface/BTextView/TextView.cpp
@@ -1872,9 +1872,6 @@ BTextView::PointAt(int32 inOffset, float *outHeight) const
 int32
 BTextView::OffsetAt(BPoint point) const
 {
-	// TODO: When alignment is different than B_ALIGN_LEFT,
-	// this function is still broken.
-	
 	CALLED();
 	// should we even bother?
 	if (point.y >= fTextRect.bottom)
@@ -1904,10 +1901,32 @@ BTextView::OffsetAt(BPoint point) const
 	
 	point.x -= fTextRect.left;
 	point.x = max_c(point.x, 0.0);
-	
+
+	// TODO: Not exactly clean and performant: fix this.
+#if 1
+	int32 offset = line->offset;
+	int32 limit = (line + 1)->offset;
+	int32 saveOffset;
+	float x = fTextRect.left;
+	do {
+		saveOffset = offset;
+		int32 nextInitial = NextInitialByte(offset);
+		float width = StyledWidth(saveOffset, nextInitial - saveOffset);
+		if (x + width > point.x) {
+			if (abs(x + width - point.x) < abs(x - point.x))
+				offset = nextInitial;
+			break;
+		}
+
+		x += width;
+		offset = nextInitial;
+	} while (offset < limit);
+
+#else
+
 	// do a pseudo-binary search of the character widths on the line
 	// that PixelToLine() gave us
-	// note: the right half of a character returns its offset + 1
+	// note: the right half of a character returns its offset + 1	
 	int32 offset = line->offset;
 	int32 saveOffset = offset;
 	int32 delta = 0;
@@ -1988,7 +2007,8 @@ BTextView::OffsetAt(BPoint point) const
 		length -= numChars;
 		numChars = length;
 	} while (foundTab && length > 0);
-	
+#endif	
+
 	if (offset == (line + 1)->offset) {
 		// special case: newlines aren't visible
 		// return the offset of the character preceding the newline