--- deliantra/Deliantra-Client/Client.xs	2006/04/11 13:05:11	1.14
+++ deliantra/Deliantra-Client/Client.xs	2006/04/11 17:02:35	1.17
@@ -22,11 +22,21 @@
 typedef struct cf_layout {
   PangoLayout *pl;
   int base_height;
-} *Crossfire__Client__Layout;
+} *CFClient__Layout;
 
 static void
-layout_get_pixel_size (Crossfire__Client__Layout self, int *w, int *h)
+layout_update (CFClient__Layout self)
 {
+  PangoFontDescription *font = pango_context_get_font_description (context);
+  pango_font_description_set_absolute_size (font, self->base_height * PANGO_SCALE);
+}
+
+static void
+layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
+{
+  PangoFontDescription *font = pango_context_get_font_description (context);
+  pango_font_description_set_absolute_size (font, self->base_height * PANGO_SCALE);
+
   pango_layout_get_pixel_size (self->pl, w, h);
 
   *w = (*w + 3) & ~3;
@@ -34,7 +44,7 @@
   if (!*h) *h = 1;
 }
 
-MODULE = Crossfire::Client	PACKAGE = Crossfire::Client
+MODULE = CFClient	PACKAGE = CFClient
 
 PROTOTYPES: ENABLE
 
@@ -79,9 +89,9 @@
         pango_context_set_font_description (context, font);
 }
 
-MODULE = Crossfire::Client	PACKAGE = Crossfire::Client::Layout
+MODULE = CFClient	PACKAGE = CFClient::Layout
 
-Crossfire::Client::Layout
+CFClient::Layout
 new (SV *class, int base_height = 10)
 	CODE:
         New (0, RETVAL, 1, struct cf_layout);
@@ -92,13 +102,13 @@
         RETVAL
 
 void
-DESTROY (Crossfire::Client::Layout self)
+DESTROY (CFClient::Layout self)
 	CODE:
         g_object_unref (self->pl);
         Safefree (self);
 
 void
-set_markup (Crossfire::Client::Layout self, SV *text_)
+set_markup (CFClient::Layout self, SV *text_)
 	CODE:
 {
 	STRLEN textlen;
@@ -108,19 +118,22 @@
 }
 
 void
-set_width (Crossfire::Client::Layout self, int max_width = -1)
+set_height (CFClient::Layout self, int base_height)
+	CODE:
+        self->base_height = base_height;
+
+void
+set_width (CFClient::Layout self, int max_width = -1)
 	CODE:
         pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
 
 void
-size (Crossfire::Client::Layout self)
+size (CFClient::Layout self)
 	PPCODE:
 {
 	int w, h;
 
-	PangoFontDescription *font = pango_context_get_font_description (context);
-        pango_font_description_set_absolute_size (font, self->base_height * PANGO_SCALE);
-
+        layout_update (self);
         layout_get_pixel_size (self, &w, &h);
 
         EXTEND (SP, 2);
@@ -128,14 +141,42 @@
         PUSHs (sv_2mortal (newSViv (h)));
 }
 
+int
+xy_to_index (CFClient::Layout self, int x, int y)
+	CODE:
+{
+	int index, trailing;
+
+        layout_update (self);
+        pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
+
+        RETVAL = index;
+}
+	OUTPUT:
+        RETVAL
+
+void
+cursor_pos (CFClient::Layout self, int index)
+	PPCODE:
+{
+	PangoRectangle strong_pos;
+        layout_update (self);
+        pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
+        EXTEND (SP, 3);
+        PUSHs (sv_2mortal (newSViv (strong_pos.x      / PANGO_SCALE)));
+        PUSHs (sv_2mortal (newSViv (strong_pos.y      / PANGO_SCALE)));
+        PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
+}
+
 void
-render (Crossfire::Client::Layout self)
+render (CFClient::Layout self)
 	PPCODE:
 {
         SV *retval;
         int w, h;
         FT_Bitmap bitmap;
 
+        layout_update (self);
         layout_get_pixel_size (self, &w, &h);
 
         retval = newSV (w * h);
@@ -159,7 +200,7 @@
         PUSHs (sv_2mortal (retval));
 }
 
-MODULE = Crossfire::Client	PACKAGE = Crossfire::Client::Texture
+MODULE = CFClient	PACKAGE = CFClient::Texture
 
 void
 draw_quad (SV *self, double x, double y, double w = 0, double h = 0)