--- deliantra/Deliantra-Client/DC/UI.pm	2006/06/21 12:59:23	1.309
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/06/23 22:35:16	1.311
@@ -337,6 +337,10 @@
    Carp::confess "size_request is abstract";
 }
 
+sub baseline_shift {
+   0
+}
+
 sub configure {
    my ($self, $x, $y, $w, $h) = @_;
 
@@ -1093,7 +1097,7 @@
    if ($self->{has_close_button}) {
       $self->{close_button} =
          new CFClient::UI::ImageButton
-            image       => 'x1_close.png',
+            path        => 'x1_close.png',
             on_activate => sub { $self->hide };
 
       $self->CFClient::UI::Container::add ($self->{close_button});
@@ -1440,35 +1444,35 @@
    my ($self, $w, $h) = @_;
 
    my $space = $self->{vertical} ? $h : $w;
-   my $children = $self->{children};
+   my @children = $self->visible_children;
 
    my @req;
 
    if ($self->{homogeneous}) {
-      @req = ($space / (@$children || 1)) x @$children;
+      @req = ($space / (@children || 1)) x @children;
    } else {
-      @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
+      @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
       my $req = List::Util::sum @req;
 
       if ($req > $space) {
          # ah well, not enough space
          $_ *= $space / $req for @req;
       } else {
-         my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
+         my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
          
          $space = ($space - $req) / $expand; # remaining space to give away
 
-         $req[$_] += $space * $children->[$_]{expand}
-            for 0 .. $#$children;
+         $req[$_] += $space * $children[$_]{expand}
+            for 0 .. $#children;
       }
    }
 
    CFClient::UI::harmonize \@req;
 
    my $pos = 0;
-   for (0 .. $#$children) {
+   for (0 .. $#children) {
       my $alloc = $req[$_];
-      $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
+      $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
 
       $pos += $alloc;
    }
@@ -1633,6 +1637,10 @@
    @{ $self->{size_req} }
 }
 
+sub baseline_shift {
+   $_[0]{layout}->descent
+}
+
 sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
@@ -2094,25 +2102,26 @@
 our @ISA = CFClient::UI::Base::;
 
 use CFClient::OpenGL;
-use Carp qw/confess/;
 
-our %loaded_images;
+our %texture_cache;
 
 sub new {
    my $class = shift;
 
-   my $self = $class->SUPER::new (can_events => 0, @_);
-
-   $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
+   my $self = $class->SUPER::new (
+      can_events => 0,
+      @_,
+   );
 
-   $loaded_images{$self->{image}} ||=
-      new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
+   $self->{path}
+      or Carp::croak "required attribute 'path' not set";
 
-   my $tex = $self->{tex} = $loaded_images{$self->{image}};
+   $self->{tex} = $texture_cache{$self->{path}} ||=
+      new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
 
-   Scalar::Util::weaken $loaded_images{$self->{image}};
+   Scalar::Util::weaken $texture_cache{$self->{path}};
 
-   $self->{aspect} = $tex->{w} / $tex->{h};
+   $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
 
    $self
 }
@@ -2120,7 +2129,7 @@
 sub size_request {
    my ($self) = @_;
 
-   ($self->{tex}->{w}, $self->{tex}->{h})
+   ($self->{tex}{w}, $self->{tex}{h})
 }
 
 sub _draw {
@@ -2568,12 +2577,21 @@
    $self->reflow;
 }
 
+sub visible_children {
+   my ($self) = @_;
+
+   @{$self->{children}}[0,1]
+}
+
 sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
+   my ($empty, $slider, @other) = @{ $self->{children} };
+   $_->configure (@$_{qw(x y req_w req_h)}) for @other;
+
    $self->{layout}->set_font ($self->{font}) if $self->{font};
    $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
-   $self->{layout}->set_width ($self->{children}[0]{w});
+   $self->{layout}->set_width ($empty->{w});
    $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
 
    $self->reflow;
@@ -2581,17 +2599,25 @@
    $self->SUPER::invoke_size_allocate ($w, $h)
 }
 
-sub text_size {
-   my ($self, $text, $indent) = @_;
+sub get_layout {
+   my ($self, $para) = @_;
 
    my $layout = $self->{layout};
 
+   $layout->set_font ($self->{font}) if $self->{font};
+   $layout->set_foreground (@{$para->{fg}});
    $layout->set_height ($self->{fontsize} * $::FONTSIZE);
-   $layout->set_width ($self->{children}[0]{w} - $indent);
+   $layout->set_width ($self->{children}[0]{w} - $para->{indent});
    $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
-   $layout->set_markup ($text);
-   
-   $layout->size
+   $layout->set_markup ($para->{markup});
+
+   $layout->set_shapes (
+      map
+         +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
+         @{$para->{widget}}
+   );
+
+   $layout
 }
 
 sub reflow {
@@ -2611,21 +2637,40 @@
 sub clear {
    my ($self) = @_;
 
+   my (undef, undef, @other) = @{ $self->{children} };
+   $self->remove ($_) for @other;
+
    $self->{par} = [];
    $self->{height} = 0;
    $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
 }
 
 sub add_paragraph {
-   my ($self, $color, $text, $indent) = @_;
+   my ($self, $color, $para, $indent) = @_;
 
-   for my $line (split /\n/, $text) {
-      my ($w, $h) = $self->text_size ($line);
-      $self->{height} += $h;
-      push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
-   }
+   my ($text, @w) = ref $para ? @$para : $para;
+
+   $para = {
+      w       => 1e10,
+      wrapped => 1,
+      fg      => $color,
+      indent  => $indent,
+      markup  => $text,
+      widget  => \@w,
+   };
 
-   $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
+   $self->add (@w) if @w;
+   push @{$self->{par}}, $para;
+
+   $self->{need_reflow}++;
+   $self->update;
+}
+
+sub scroll_to_bottom {
+   my ($self) = @_;
+
+   $self->{scroll_to_bottom} = 1;
+   $self->update;
 }
 
 sub update {
@@ -2643,30 +2688,30 @@
       if (delete $self->{need_reflow}) {
          my $height = 0;
 
-         my $layout = $self->{layout};
-
-         $layout->set_height ($self->{fontsize} * $::FONTSIZE);
-
-         for (@{$self->{par}}) {
-            if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
-               $layout->set_width ($W - $_->[3]);
-               $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
-               $layout->set_markup ($_->[4]);
+         for my $para (@{$self->{par}}) {
+            if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
+               my $layout = $self->get_layout ($para);
                my ($w, $h) = $layout->size;
-               $_->[0] = $w + $_->[3];
-               $_->[1] = $h;
+
+               $para->{w}       = $w + $para->{indent};
+               $para->{h}       = $h;
+               $para->{wrapped} = $layout->has_wrapped;
             }
 
-            $height += $_->[1];
+            $height += $para->{h};
          }
 
          $self->{height} = $height;
 
-         $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
+         $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
 
          delete $self->{texture};
       }
 
+      if (delete $self->{scroll_to_bottom}) {
+         $self->{children}[1]->set_value (1e10);
+      }
+
       $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
          glClearColor 0, 0, 0, 0;
          glClear GL_COLOR_BUFFER_BIT;
@@ -2678,27 +2723,34 @@
 
          my $y = 0;
 
-         my $layout = $self->{layout};
-
-         $layout->set_font ($self->{font}) if $self->{font};
-
          glEnable GL_BLEND;
          #TODO# not correct in windows where rgba is forced off
          glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
 
-         for my $par (@{$self->{par}}) {
-            my $h = $par->[1];
+         for my $para (@{$self->{par}}) {
+            my $h = $para->{h};
 
             if ($y0 < $y + $h && $y < $y1) {
-               $layout->set_foreground (@{ $par->[2] });
-               $layout->set_width ($W - $par->[3]);
-               $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
-               $layout->set_markup ($par->[4]);
+
+               my $layout = $self->get_layout ($para);
 
                my ($w, $h, $data, $format, $internalformat) = $layout->render;
 
-               glRasterPos $par->[3], $y - $y0;
+               glRasterPos $para->{indent}, $y - $y0;
                glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
+
+               if (my @w = @{ $para->{widget} }) {
+                  my @s = $layout->get_shapes;
+
+                  for (@w) {
+                     my ($dx, $dy) = splice @s, 0, 2, ();
+
+                     $_->{x} = $dx + $para->{indent};
+                     $_->{y} = $dy + $y - $y0;
+
+                     $_->draw;
+                  }
+               }
             }
 
             $y += $h;
@@ -2709,6 +2761,15 @@
    });
 }
 
+sub reconfigure {
+   my ($self) = @_;
+
+   $self->SUPER::reconfigure;
+
+   $_->{w} = 1e10 for @{ $self->{par} };
+   $self->reflow;
+}
+
 sub _draw {
    my ($self) = @_;
 
@@ -2719,7 +2780,6 @@
    glDisable GL_TEXTURE_2D;
 
    $self->{children}[1]->draw;
-
 }
 
 #############################################################################