|
 |
7725c1a |
Index: mozilla/gfx/src/gtk/nsFontMetricsPango.cpp
|
|
|
7725c1a |
===================================================================
|
|
|
7725c1a |
RCS file: /cvsroot/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp,v
|
|
|
7725c1a |
retrieving revision 1.24
|
|
|
7725c1a |
diff -d -u -p -6 -r1.24 nsFontMetricsPango.cpp
|
|
|
7725c1a |
--- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 25 Aug 2006 01:02:34 -0000 1.24
|
|
|
7725c1a |
+++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 6 Sep 2006 07:01:49 -0000
|
|
|
7725c1a |
@@ -948,13 +948,12 @@ nsFontMetricsPango::GetClusterInfo(const
|
|
|
7725c1a |
PRInt32
|
|
|
7725c1a |
nsFontMetricsPango::GetPosition(const PRUnichar *aText, PRUint32 aLength,
|
|
|
7725c1a |
nsPoint aPt)
|
|
|
7725c1a |
{
|
|
|
7725c1a |
int trailing = 0;
|
|
|
7725c1a |
int inx = 0;
|
|
|
7725c1a |
- gboolean found = FALSE;
|
|
|
7725c1a |
const gchar *curChar;
|
|
|
7725c1a |
PRInt32 retval = 0;
|
|
|
7725c1a |
|
|
|
7725c1a |
float f = mDeviceContext->AppUnitsToDevUnits();
|
|
|
7725c1a |
|
|
|
7725c1a |
PangoLayout *layout = pango_layout_new(mPangoContext);
|
|
|
7725c1a |
@@ -974,28 +973,18 @@ nsFontMetricsPango::GetPosition(const PR
|
|
|
7725c1a |
}
|
|
|
7725c1a |
|
|
|
7725c1a |
// Set up the pango layout
|
|
|
7725c1a |
pango_layout_set_text(layout, text, strlen(text));
|
|
|
7725c1a |
FixupSpaceWidths(layout, text);
|
|
|
7725c1a |
|
|
|
7725c1a |
- found = pango_layout_xy_to_index(layout, localX, localY,
|
|
|
7725c1a |
- &inx, &trailing);
|
|
|
7725c1a |
+ pango_layout_xy_to_index(layout, localX, localY,
|
|
|
7725c1a |
+ &inx, &trailing);
|
|
|
7725c1a |
|
|
|
7725c1a |
// Convert the index back to the utf-16 index
|
|
|
7725c1a |
curChar = text;
|
|
|
7725c1a |
|
|
|
7725c1a |
- // Jump to the end if it's not found.
|
|
|
7725c1a |
- if (!found) {
|
|
|
7725c1a |
- if (inx == 0)
|
|
|
7725c1a |
- retval = 0;
|
|
|
7725c1a |
- else if (trailing)
|
|
|
7725c1a |
- retval = aLength;
|
|
|
7725c1a |
-
|
|
|
7725c1a |
- goto loser;
|
|
|
7725c1a |
- }
|
|
|
7725c1a |
-
|
|
|
7725c1a |
for (PRUint32 curOffset=0; curOffset < aLength;
|
|
|
7725c1a |
curOffset++, curChar = g_utf8_find_next_char(curChar, NULL)) {
|
|
|
7725c1a |
|
|
|
7725c1a |
// Check for a match before checking for a surrogate pair
|
|
|
7725c1a |
if (curChar - text == inx) {
|
|
|
7725c1a |
retval = curOffset;
|