--- deliantra/Deliantra-Client/Client.xs	2006/11/07 22:41:27	1.164
+++ deliantra/Deliantra-Client/Client.xs	2006/12/08 14:59:54	1.165
@@ -1051,7 +1051,7 @@
 {
 	int index, trailing;
         pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
-        RETVAL = index;
+        RETVAL = index + trailing;
 }
 	OUTPUT:
         RETVAL
@@ -1070,6 +1070,46 @@
 }
 
 void
+index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
+	PPCODE:
+{
+	int line, x;
+
+	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
+        /* pango bug: line is between 1..numlines, not 0..numlines-1 */
+
+        EXTEND (SP, 2);
+        PUSHs (sv_2mortal (newSViv (line - 1)));
+        PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
+}
+
+void
+line_x_to_index (CFPlus::Layout self, int line, int x)
+	PPCODE:
+{
+	PangoLayoutLine *lp;
+        int index, trailing;
+
+        if (line < 0)
+          XSRETURN_EMPTY;
+
+        if (!(lp = pango_layout_get_line (self->pl, line)))
+          XSRETURN_EMPTY; /* do better */
+
+        if (!pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing))
+          XSRETURN_EMPTY; /* do better */
+
+        EXTEND (SP, 2);
+        if (GIMME_V == G_SCALAR)
+          PUSHs (sv_2mortal (newSViv (index + trailing)));
+        else
+          {
+            PUSHs (sv_2mortal (newSViv (index)));
+            PUSHs (sv_2mortal (newSViv (trailing)));
+          }
+}
+
+void
 render (CFPlus::Layout self, float x, float y, int flags = 0)
 	PPCODE:
         pango_opengl_render_layout_subpixel (