--- deliantra/Deliantra-Client/DC/UI.pm	2006/07/02 21:07:26	1.319
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/07/04 23:23:32	1.320
@@ -1538,7 +1538,7 @@
       #markup    => initial narkup
       #max_w     => maximum pixel width
       ellipsise  => 3, # end
-      layout     => (new CFClient::Layout),
+      layout     => (new CFClient::Layout 2),
       fontsize   => 1,
       align      => -1,
       valign     => -1,
@@ -1549,7 +1549,7 @@
    );
 
    if (exists $self->{template}) {
-      my $layout = new CFClient::Layout;
+      my $layout = new CFClient::Layout 2;
       $layout->set_text (delete $self->{template});
       $self->{template} = $layout;
    }
@@ -1593,7 +1593,6 @@
    return if $self->{text} eq "T$text";
    $self->{text} = "T$text";
 
-   $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
    $self->{layout}->set_text ($text);
 
    delete $self->{size_req};
@@ -1609,7 +1608,6 @@
 
    my $rgba = $markup =~ /span.*(?:foreground|background)/;
 
-   $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
    $self->{layout}->set_markup ($markup);
 
    delete $self->{size_req};
@@ -1674,6 +1672,7 @@
    my ($self) = @_;
 
    delete $self->{size_req};
+   delete $self->{texture};
 
    $self->SUPER::reconfigure;
 }
@@ -1683,7 +1682,7 @@
 
    $self->SUPER::_draw; # draw background, if applicable
 
-   my $tex = $self->{texture} ||= do {
+   my $size = $self->{texture} ||= do {
       $self->{layout}->set_foreground (@{$self->{fg}});
       $self->{layout}->set_font ($self->{font}) if $self->{font};
       $self->{layout}->set_width ($self->{w});
@@ -1691,34 +1690,23 @@
       $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
       $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
 
-      new_from_layout CFClient::Texture $self->{layout}
+      $self->{size_req}
    };
 
    unless (exists $self->{ox}) {
       $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
-                       : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
-                       :                      ($self->{w} - $tex->{w}) * 0.5);
+                       : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
+                       :                      ($self->{w} - $size->[0]) * 0.5);
 
       $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
-                       : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
-                       :                       ($self->{h} - $tex->{h}) * 0.5);
+                       : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
+                       :                       ($self->{h} - $size->[1]) * 0.5);
    };
 
-   glEnable GL_TEXTURE_2D;
-
-   my $w = List::Util::min $self->{w} + 4, $tex->{w};
-   my $h = List::Util::min $self->{h} + 2, $tex->{h};
+   my $w = List::Util::min $self->{w} + 4, $size->[0];
+   my $h = List::Util::min $self->{h} + 2, $size->[1];
 
-   if ($tex->{format} == GL_ALPHA) {
-      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
-      glColor @{$self->{fg}};
-      $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
-   } else {
-      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-      $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
-   }
-
-   glDisable GL_TEXTURE_2D;
+   $self->{layout}->render ($self->{ox}, $self->{oy});
 }
 
 #############################################################################
@@ -2575,7 +2563,7 @@
       #font      => default_font
       @_,
                  
-      layout     => (new CFClient::Layout 1),
+      layout     => (new CFClient::Layout 2),
       par        => [],
       height     => 0,
       children   => [
@@ -2746,10 +2734,6 @@
 
          my $y = 0;
 
-         glEnable GL_BLEND;
-         #TODO# not correct in windows where rgba is forced off
-         glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
-
          for my $para (@{$self->{par}}) {
             my $h = $para->{h};
 
@@ -2757,15 +2741,11 @@
 
                my $layout = $self->get_layout ($para);
 
-               my ($w, $h, $data, $format, $internalformat) = $layout->render;
-
-               glRasterPos $para->{indent}, $y - $y0;
-               glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
+               $layout->render ($para->{indent}, $y - $y0);
 
                if (my @w = @{ $para->{widget} }) {
                   my @s = $layout->get_shapes;
 
-                  glDisable GL_BLEND;
                   for (@w) {
                      my ($dx, $dy) = splice @s, 0, 2, ();
 
@@ -2774,15 +2754,11 @@
 
                      $_->draw;
                   }
-                  glEnable GL_BLEND;
-                  glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
                }
             }
 
             $y += $h;
          }
-
-         glDisable GL_BLEND;
       };
    });
 }
@@ -3863,6 +3839,25 @@
    }
 
    $self->_draw;
+
+   #TODO#d# display texture cache
+   {
+      glEnable GL_TEXTURE_2D;
+      glBindTexture GL_TEXTURE_2D, 41;
+      glColor 1, 1, 1, 1;
+      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+      glEnable GL_BLEND;
+      glBlendFunc GL_SRC_ALPHA, GL_ZERO;
+      glBegin GL_QUADS;
+      glTexCoord 0,1; glVertex 0,0;
+      glTexCoord 1,1; glVertex 255,0;
+      glTexCoord 1,0; glVertex 255,255;
+      glTexCoord 0,0; glVertex 0,255;
+      glEnd;
+      glDisable GL_BLEND;
+      glDisable GL_TEXTURE_2D;
+   }
+
 }
 
 #############################################################################