--- deliantra/Deliantra-Client/Client.xs	2007/08/11 11:21:46	1.224
+++ deliantra/Deliantra-Client/Client.xs	2007/08/11 12:07:54	1.225
@@ -152,6 +152,7 @@
   float r, g, b, a; // default color for rgba mode
   int base_height;
   CFPlus__Font font;
+  rc_t *rc;
 } *CFPlus__Layout;
 
 static CFPlus__Font default_font;
@@ -1038,6 +1039,7 @@
         RETVAL->a           = 1.;
         RETVAL->base_height = MIN_FONT_HEIGHT;
         RETVAL->font        = 0;
+        RETVAL->rc          = rc_alloc ();
 
         pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
         layout_update_font (RETVAL);
@@ -1048,6 +1050,7 @@
 DESTROY (CFPlus::Layout self)
 	CODE:
         g_object_unref (self->pl);
+        rc_free (self->rc);
         Safefree (self);
 
 void
@@ -1309,13 +1312,37 @@
 
 void
 render (CFPlus::Layout self, float x, float y, int flags = 0)
-	PPCODE:
+	CODE:
+        rc_clear (self->rc);
         pango_opengl_render_layout_subpixel (
           self->pl,
+          self->rc,
           x * PANGO_SCALE, y * PANGO_SCALE,
           self->r, self->g, self->b, self->a,
           flags
         );
+        // we assume that context_change actually clears/frees stuff
+        // and does not do any recomputation...
+        pango_layout_context_changed (self->pl);
+
+void
+draw (CFPlus::Layout self)
+	CODE:
+{
+        glEnable (GL_TEXTURE_2D);
+        glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+        glEnable (GL_BLEND);
+        gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
+                              GL_ONE      , GL_ONE_MINUS_SRC_ALPHA);
+        glEnable (GL_ALPHA_TEST);
+        glAlphaFunc (GL_GREATER, 7.f / 255.f);
+
+        rc_draw (self->rc);
+
+        glDisable (GL_ALPHA_TEST);
+        glDisable (GL_BLEND);
+        glDisable (GL_TEXTURE_2D);
+}
 
 MODULE = CFPlus	PACKAGE = CFPlus::Texture