--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/14 14:02:52	1.104
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/14 14:55:28	1.105
@@ -63,8 +63,8 @@
    if ($widget != $HOVER) {
       my $hover = $HOVER; $HOVER = $widget;
 
-      $hover->update if $hover;
-      $HOVER->update if $HOVER;
+      $hover->update if $hover && $hover->{can_hover};
+      $HOVER->update if $HOVER && $HOVER->{can_hover};
    }
 
    $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
@@ -441,10 +441,11 @@
 sub render_chld {
    my ($self) = @_;
 
-   $self->{texture} =
-      CFClient::Texture->new_from_opengl (
-         $self->{w}, $self->{h}, sub { $self->child->draw }
-      );
+   $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
+      glClearColor 0, 0, 0, 1;
+      glClear GL_COLOR_BUFFER_BIT;
+      $self->child->draw;
+   };
 }
 
 sub size_allocate {
@@ -833,7 +834,7 @@
    my $y = 0;
    for (0 .. $#$children) {
       my $child = $children->[$_];
-      my $h = $h[$_];
+      my $h = int $h[$_];
       $child->size_allocate ($y, 0, $h, $w);
 
       $y += $h;
@@ -887,7 +888,7 @@
    my $y = 0;
    for (0 .. $#$children) {
       my $child = $children->[$_];
-      my $h = $h[$_];
+      my $h = int $h[$_];
       $child->size_allocate (0, $y, $w, $h);
 
       $y += $h;
@@ -906,12 +907,12 @@
    my ($class, %arg) = @_;
 
    my $self = $class->SUPER::new (
-      fg      => [1, 1, 1],
-      height  => $::FONTSIZE,
-      text    => "",
-      align   => -1,
-      padding => 2,
-      layout  => new CFClient::Layout,
+      fg       => [1, 1, 1],
+      fontsize => $::FONTSIZE,
+      text     => "",
+      align    => -1,
+      padding  => 2,
+      layout   => new CFClient::Layout,
       %arg
    );
 
@@ -951,7 +952,7 @@
    my ($self) = @_;
 
    $self->{layout}->set_width;
-   $self->{layout}->set_height ($self->{height});
+   $self->{layout}->set_height ($self->{fontsize});
    my ($w, $h) = $self->{layout}->size;
 
    (
@@ -980,14 +981,14 @@
 
    my $tex = $self->{texture} ||= do {
       $self->{layout}->set_width ($self->{w});
-      $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
+      $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
       new_from_layout CFClient::Texture $self->{layout}
    };
 
    glEnable GL_BLEND;
    glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
    glEnable GL_TEXTURE_2D;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
    glColor @{$self->{fg}};
 
@@ -996,8 +997,7 @@
     : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
     :                      ($self->{w} - $tex->{w}) * 0.5;
 
-   glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
-   $tex->draw_quad (0, 0);
+   $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
 
    glDisable GL_TEXTURE_2D;
    glDisable GL_BLEND;
@@ -1035,7 +1035,7 @@
 
    $self->{text} = $text;
    $self->{layout}->set_width ($self->{w});
-   $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
+   $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
 
    $text =~ s/./*/g if $self->{hidden};
 
@@ -1467,8 +1467,14 @@
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      par      => [],
+      req_w    => $::WIDTH / 6,
+      req_h    => $::HEIGHT / 6,
+      fontsize => $::FONTSIZE,
       @_,
+
+      layout   => (new CFClient::Layout),
+      par      => [],
+      height   => 0,
       children => [
          (new CFClient::UI::Empty expand => 1),
          (new CFClient::UI::Slider vertical => 1),
@@ -1478,48 +1484,117 @@
    $self
 }
 
+sub text_height {
+   my ($self, $text) = @_;
+
+   my $layout = $self->{layout};
+
+   $layout->set_height ($self->{fontsize});
+   $layout->set_width ($self->{w});
+   $layout->set_text ($text);
+   
+   ($layout->size)[1]
+}
+
+sub reflow {
+   my ($self) = @_;
+
+   my $height = 0;
+
+   for (@{$self->{par}}) {
+      $height += $_->[0] = $self->text_height ($_->[2]);
+   }
+
+   $self->{height} = $height;
+
+   $self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
+}
+
+sub size_request {
+   my ($self) = @_;
+
+   ($self->{req_w}, $self->{req_h})
+}
+
+sub size_allocate {
+   my ($self, $x, $y, $w, $h) = @_;
+
+   $self->SUPER::size_allocate ($x, $y, $w, $h);
+
+   $self->{layout}->set_height ($self->{fontsize});
+   $self->{layout}->set_width ($self->{w});
+
+   $self->reflow;
+   $self->update;
+}
+
 sub add_paragraph {
    my ($self, $color, $text) = @_;
 
-   push @{$self->{par}}, [$color, $text];
-   my $count = scalar @{$self->{par}};
-   $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
+   #TODO: intelligently "reformat" paragraph
+
+   my $height = $self->text_height ($text);
+
+   $self->{height} += $height;
+
+   push @{$self->{par}}, [$height, $color, $text];
+
+   $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
    $self->{children}[1]->update;
 }
 
-sub _draw {
+sub update {
    my ($self) = @_;
 
-   my $par = $self->{par};
+   $self->SUPER::update;
 
-   my $bottom = (scalar @$par) - 1;
+   return unless $self->{h} > 0;
 
-   my $w = $self->{children}[0]{w};
-   my $y = $self->{h};
+   $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
+      glClearColor 0, 0, 0, 1;
+      glClear GL_COLOR_BUFFER_BIT;
 
-   glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-   glEnable GL_TEXTURE_2D;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+      my $y0 = $self->{height} - $self->{h};
+      my $y1 = $self->{height};
+
+      glEnable GL_BLEND;
+      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+      glEnable GL_TEXTURE_2D;
+      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
-   # TODO: everything!
-   while ($y > 0 && $bottom >= 0) {
-      my $par = $par->[$bottom--];
-
-      my $layout = new CFClient::Layout;
-
-      $layout->set_height ($::FONTSIZE);
-      $layout->set_width ($w);
-      $layout->set_text ($par->[1]);
-      my $tex = new_from_layout CFClient::Texture $layout;
-      $y -= $tex->{h};
+      my $y = 0;
 
-      glColor @{ $par->[0] };
-      $tex->draw_quad (0, $y);
+      my $layout = $self->{layout};
+
+      for my $par (@{$self->{par}}) {
+         my $h = $par->[0];
+
+         if ($y0 < $y + $h && $y < $y1) {
+            $layout->set_text ($par->[2]);
+
+            glColor @{ $par->[1] };
+            my ($W, $H) = $layout->size;
+            CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
+         }
+
+         $y += $h;
+      }
+
+      glDisable GL_TEXTURE_2D;
+      glDisable GL_BLEND;
+   };
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   if ($self->{texture}) {
+      glEnable GL_TEXTURE_2D;
+      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+      $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
+      glDisable GL_TEXTURE_2D;
    }
 
-   glDisable GL_TEXTURE_2D;
-   glDisable GL_BLEND;
 }
 
 #############################################################################