--- deliantra/Deliantra-Client/DC/UI.pm	2006/05/17 14:55:14	1.212
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/05/28 22:24:24	1.251
@@ -7,15 +7,35 @@
 use List::Util ();
 
 use CFClient;
+use CFClient::Texture;
 
 our ($FOCUS, $HOVER, $GRAB); # various widgets
 
+our $LAYOUT;
 our $ROOT;
 our $TOOLTIP;
 our $BUTTON_STATE;
 
 our %WIDGET; # all widgets, weak-referenced
 
+sub get_layout {
+   for (grep { $_->{name} } values %WIDGET) {
+      $LAYOUT->{$_->{name}} = {
+         x => $_->{x} / $::WIDTH,
+         y => $_->{y} / $::HEIGHT,
+         w => $_->{w} / $::WIDTH,
+         h => $_->{h} / $::HEIGHT
+      };
+   }
+
+   return $LAYOUT;
+}
+
+sub set_layout {
+   my ($layout) = @_;
+   $LAYOUT = $layout;
+}
+
 sub check_tooltip {
    if (!$GRAB) {
       for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
@@ -37,8 +57,7 @@
                   if $x + $TOOLTIP->{w} > $::WIDTH;
 
                $TOOLTIP->move ($x, $y);
-               $TOOLTIP->check_size;
-               $TOOLTIP->update;
+               $TOOLTIP->realloc;
             }
 
             return;
@@ -52,12 +71,12 @@
 
 # class methods for events
 sub feed_sdl_key_down_event { 
-   $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
+   $FOCUS->emit (key_down => $_[0])
       if $FOCUS;
 }
 
 sub feed_sdl_key_up_event {
-   $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
+   $FOCUS->emit (key_up => $_[0])
       if $FOCUS;
 }
 
@@ -76,10 +95,8 @@
 
    $BUTTON_STATE |= 1 << ($ev->{button} - 1);
 
-   if ($GRAB) {
-      ($x, $y) = $GRAB->coord2local ($x, $y);
-      $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
-   }
+   $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
+      if $GRAB;
 }
 
 sub feed_sdl_button_up_event {
@@ -90,10 +107,8 @@
 
    $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
 
-   if ($GRAB) {
-      ($x, $y) = $GRAB->coord2local ($x, $y);
-      $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
-   }
+   $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
+      if $GRAB;
 
    if (!$BUTTON_STATE) {
       my $grab = $GRAB; undef $GRAB;
@@ -119,10 +134,8 @@
       check_tooltip;
    }
 
-   if ($HOVER) {
-      ($x, $y) = $HOVER->coord2local ($x, $y);
-      $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
-   }
+   $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
+      if $HOVER;
 }
 
 # convert position array to integers
@@ -138,24 +151,38 @@
    }
 }
 
+sub full_refresh {
+   # make a copy, otherwise for complains about freed values.
+   my @widgets = values %WIDGET;
+
+   $_->update
+      for @widgets;
+}
+
+sub reconfigure_widgets {
+   # make a copy, otherwise C<for> complains about freed values.
+   my @widgets = values %WIDGET;
+
+   $_->reconfigure
+      for @widgets;
+}
+
 # call when resolution changes etc.
 sub rescale_widgets {
    my ($sx, $sy) = @_;
 
    for my $widget (values %WIDGET) {
-      if ($widget->{toplevel}) {
+      if ($widget->{is_toplevel}) {
          $widget->{x}      = int 0.5 + $widget->{x}      * $sx if exists $widget->{x};
          $widget->{w}      = int 0.5 + $widget->{w}      * $sx if exists $widget->{w};
          $widget->{req_w}  = int 0.5 + $widget->{req_w}  * $sx if exists $widget->{req_w};
-         $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
          $widget->{y}      = int 0.5 + $widget->{y}      * $sy if exists $widget->{y};
          $widget->{h}      = int 0.5 + $widget->{h}      * $sy if exists $widget->{h};
          $widget->{req_h}  = int 0.5 + $widget->{req_h}  * $sy if exists $widget->{req_h};
-         $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
       }
-
-      $widget->reconfigure;
    }
+
+   reconfigure_widgets;
 }
 
 #############################################################################
@@ -178,13 +205,20 @@
    }, $class;
 
    for (keys %$self) {
-      if (/^connect_(.*)$/) {
+      if (/^on_(.*)$/) {
          $self->connect ($1 => delete $self->{$_});
       }
    }
 
    Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
 
+   if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
+      $self->{req_x} = $layout->{x} * $::WIDTH;
+      $self->{req_y} = $layout->{y} * $::HEIGHT;
+      $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
+      $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
+   }
+
    $self
 }
 
@@ -203,12 +237,76 @@
    $CFClient::UI::ROOT->add ($self);
 }
 
-sub hide {
+sub center {
    my ($self) = @_;
 
+   $CFClient::UI::ROOT->on_post_alloc (
+      "center_$self" => sub {
+         $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
+      },
+   );
+
+   $self->update;
+}
+
+sub set_visible {
+   my ($self) = @_;
+
+   return if $self->{visible};
+
+   $self->{root}    = $self->{parent}{root};
+   $self->{visible} = $self->{parent}{visible} + 1;
+
+   $self->emit (visibility_change => 1);
+
+   $self->realloc unless exists $self->{req_w};
+
+   $_->set_visible for $self->children;
+}
+
+sub set_invisible {
+   my ($self) = @_;
+
+   return unless $self->{visible};
+
+   $_->set_invisible for $self->children;
+
+   delete $self->{root};
+   delete $self->{visible};
+
    undef $GRAB  if $GRAB  == $self;
    undef $HOVER if $HOVER == $self;
 
+   CFClient::UI::check_tooltip
+      if $TOOLTIP->{owner} == $self;
+
+   $self->focus_out;
+
+   $self->emit (visibility_change => 0);
+}
+
+sub set_visibility {
+   my ($self, $visible) = @_;
+
+   return if $self->{visible} == $visible;
+
+   $visible ? $self->hide
+            : $self->show;
+}
+
+sub toggle_visibility {
+   my ($self) = @_;
+
+   $self->{visible}
+      ? $self->hide
+      : $self->show;
+}
+
+sub hide {
+   my ($self) = @_;
+
+   $self->set_invisible;
+
    $self->{parent}->remove ($self)
       if $self->{parent};
 }
@@ -226,10 +324,10 @@
 sub set_size {
    my ($self, $w, $h) = @_;
 
-   $self->{user_w} = $w;
-   $self->{user_h} = $h;
+   $self->{def_w} = $w;
+   $self->{def_h} = $h;
 
-   $self->check_size;
+   $self->realloc;
 }
 
 sub size_request {
@@ -259,7 +357,9 @@
    }
 
    if ($self->{w} != $w || $self->{h} != $h) {
-      $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
+      return unless $self->{visible};
+
+      $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
    }
 }
 
@@ -267,13 +367,6 @@
    # nothing to be done
 }
 
-sub reconfigure {
-   my ($self) = @_;
-
-   $self->check_size (1);
-   $self->update;
-}
-
 sub children {
 }
 
@@ -287,6 +380,11 @@
 sub set_tooltip {
    my ($self, $tooltip) = @_;
 
+   $tooltip =~ s/^\s+//;
+   $tooltip =~ s/\s+$//;
+
+   return if $self->{tooltip} eq $tooltip;
+
    $self->{tooltip} = $tooltip;
 
    if ($CFClient::UI::TOOLTIP->{owner} == $self) {
@@ -317,7 +415,7 @@
 
    my $focus = $FOCUS; $FOCUS = $self;
 
-   $self->emit (focus_in => $focus);
+   $self->_emit (focus_in => $focus);
 
    $focus->update if $focus;
    $FOCUS->update;
@@ -330,15 +428,18 @@
 
    my $focus = $FOCUS; undef $FOCUS;
 
-   $self->emit (focus_out => $focus);
+   $self->_emit (focus_out => $focus);
 
    $focus->update if $focus; #?
+
+   $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
+      unless $FOCUS;
 }
 
 sub mouse_motion { }
-sub button_up { }
-sub key_down { }
-sub key_up { }
+sub button_up    { }
+sub key_down     { }
+sub key_up       { }
 
 sub button_down {
    my ($self, $ev, $x, $y) = @_;
@@ -352,6 +453,69 @@
 sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
 sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
 
+sub find_widget {
+   my ($self, $x, $y) = @_;
+
+   return () unless $self->{can_events};
+
+   return $self
+      if $x >= $self->{x} && $x < $self->{x} + $self->{w}
+          && $y >= $self->{y} && $y < $self->{y} + $self->{h};
+
+   ()
+}
+
+sub set_parent {
+   my ($self, $parent) = @_;
+
+   Scalar::Util::weaken ($self->{parent} = $parent);
+
+   $self->set_visible if $parent->{visible};
+
+   $self->realloc;
+}
+
+sub connect {
+   my ($self, $signal, $cb) = @_;
+
+   push @{ $self->{signal_cb}{$signal} }, $cb;
+}
+
+sub _emit {
+   my ($self, $signal, @args) = @_;
+
+   List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
+}
+
+sub emit {
+   my ($self, $signal, @args) = @_;
+
+   $self->_emit ($signal, @args)
+      || $self->$signal (@args);
+}
+
+sub visibility_change {
+   #my ($self, $visible) = @_;
+}
+
+sub realloc {
+   my ($self) = @_;
+
+   return unless $self->{visible};
+
+   return if $self->{root}{realloc}{$self};
+
+   $self->{root}{realloc}{$self} = $self;
+   $self->{root}->update;
+}
+
+sub update {
+   my ($self) = @_;
+
+   $self->{parent}->update
+      if $self->{parent};
+}
+
 sub draw {
    my ($self) = @_;
 
@@ -382,10 +546,10 @@
       glColor 1, 1, 0, 1;
       glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
       glBegin GL_LINE_LOOP;
-      glVertex 0         , 0;
-      glVertex $self->{w}, 0;
-      glVertex $self->{w}, $self->{h};
-      glVertex 0         , $self->{h};
+      glVertex 0             , 0;
+      glVertex $self->{w} - 1, 0;
+      glVertex $self->{w} - 1, $self->{h} - 1;
+      glVertex 0             , $self->{h} - 1;
       glEnd;
       glPopMatrix;
       #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
@@ -398,54 +562,6 @@
    warn "no draw defined for $self\n";
 }
 
-sub find_widget {
-   my ($self, $x, $y) = @_;
-
-   return () unless $self->{can_events};
-
-   return $self
-      if $x >= $self->{x} && $x < $self->{x} + $self->{w}
-          && $y >= $self->{y} && $y < $self->{y} + $self->{h};
-
-   ()
-}
-
-sub set_parent {
-   my ($self, $parent) = @_;
-
-   Scalar::Util::weaken ($self->{parent} = $parent);
-
-   # TODO: req_w _does_change after ->reconfigure
-   $self->check_size
-      unless exists $self->{req_w};
-}
-
-sub check_size {
-   my ($self, $forced) = @_;
-
-   $self->{force_alloc} = 1 if $forced;
-   $CFClient::UI::ROOT->{check_size}{$self} = $self;
-}
-
-sub update {
-   my ($self) = @_;
-
-   $self->{parent}->update
-      if $self->{parent};
-}
-
-sub connect {
-   my ($self, $signal, $cb) = @_;
-
-   push @{ $self->{signal_cb}{$signal} }, $cb;
-}
-
-sub emit {
-   my ($self, $signal, @args) = @_;
-
-   List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
-}
-
 sub DESTROY {
    my ($self) = @_;
 
@@ -550,8 +666,7 @@
          @{$self->{children}}, @widgets
    ];
 
-   $self->check_size (1);
-   $self->update;
+   $self->realloc;
 }
 
 sub children {
@@ -566,8 +681,7 @@
 
    $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
 
-   $self->check_size;
-   $self->update;
+   $self->realloc;
 }
 
 sub clear {
@@ -581,8 +695,7 @@
       $_->hide;
    }
 
-   $self->check_size;
-   $self->update;
+   $self->realloc;
 }
 
 sub find_widget {
@@ -645,7 +758,7 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $w, $h, $changed) = @_;
 
    $self->{children}[0]->configure (0, 0, $w, $h);
 }
@@ -672,10 +785,11 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $w, $h, $changed) = @_;
 
-   $self->SUPER::size_allocate ($w, $h);
-   $self->update;
+   $self->SUPER::size_allocate ($w, $h, $changed);
+   $self->update
+      if $changed;
 }
 
 sub _render {
@@ -690,13 +804,6 @@
       glClear GL_COLOR_BUFFER_BIT;
 
       $self->_render;
-#      glColorMask 1, 1, 1, 0;
-#      glEnable GL_BLEND;
-#      glBlendFunc GL_SRC_ALPHA, GL_ZERO;
-#      glRasterPos 0, 0;
-#      glCopyPixels 0, 0, $self->{w}, $self->{h};
-#      glDisable GL_BLEND;
-#      glColorMask 1, 1, 1, 1;
    };
 }
 
@@ -710,7 +817,7 @@
 
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-   glColor 0, 0, 0, 1;
+   glColor 1, 1, 1, 1;
 
    $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
 
@@ -723,18 +830,34 @@
 
 our @ISA = CFClient::UI::Window::;
 
+sub new {
+   my $class = shift;
+
+   $class->SUPER::new (
+      scroll_x => 0,
+      scroll_y => 1,
+      @_,
+   )
+}
+
 sub size_request {
    my ($self) = @_;
 
-   @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
-   $self->child->configure (0, 0, @$self{qw(child_w child_h)});
+   my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
 
-   @$self{qw(child_w child_h)}
+   $w = 10 if $self->{scroll_x};
+   $h = 10 if $self->{scroll_y};
+
+   ($w, $h)
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $w, $h, $changed) = @_;
 
+   $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
+   $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
+
+   $self->child->configure (0, 0, $w, $h);
    $self->update;
 }
 
@@ -795,15 +918,15 @@
    my $self;
 
    my $slider = new CFClient::UI::Slider
-      vertical        => 1,
-      range           => [0, 0, 1, 0.01], # HACK fix
-      connect_changed => sub {
-         $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
+      vertical   => 1,
+      range      => [0, 0, 1, 0.01], # HACK fix
+      on_changed => sub {
+         $self->{vp}->set_offset (0, $_[1]);
       },
    ;
 
    $self = $class->SUPER::new (
-      vp     => (new CFClient::UI::ViewPort),
+      vp     => (new CFClient::UI::ViewPort expand => 1),
       slider => $slider,
       @_,
    );
@@ -815,6 +938,25 @@
    $self
 }
 
+sub update {
+   my ($self) = @_;
+
+   $self->SUPER::update;
+
+   # todo: overwrite size_allocate of child
+   my $child = $self->{vp}->child;
+   $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
+}
+
+sub size_allocate {
+   my ($self, $w, $h, $changed) = @_;
+
+   $self->SUPER::size_allocate ($w, $h, $changed);
+
+   my $child = $self->{vp}->child;
+   $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
+}
+
 #TODO# update range on size_allocate depending on child
 # update viewport offset on scroll
 
@@ -873,14 +1015,12 @@
 sub new {
    my $class = shift;
 
-   # TODO: user_x, user_y, overwrite moveto?
-
    my $self = $class->SUPER::new (
-      bg         => [1, 1, 1, 1],
-      border_bg  => [1, 1, 1, 1],
-      border     => 0.6,
-      toplevel   => 1,
-      can_events => 1,
+      bg          => [1, 1, 1, 1],
+      border_bg   => [1, 1, 1, 1],
+      border      => 0.6,
+      is_toplevel => 1,
+      can_events  => 1,
       @_
    );
 
@@ -909,7 +1049,9 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $w, $h, $changed) = @_;
+
+   return unless $changed;
 
    $h -= List::Util::max 0, $self->border * 2;
    $w -= List::Util::max 0, $self->border * 2;
@@ -943,10 +1085,12 @@
          my $dx = $ev->{x} - $ox;
          my $dy = $ev->{y} - $oy;
 
-         $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
-         $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
-         $self->move ($wx + $dx * $mx, $wy + $dy * $my);
-         $self->check_size;
+         $self->{user_x} = $wx + $dx * $mx;
+         $self->{user_y} = $wy + $dy * $my;
+         $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
+         $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
+         $self->move ($self->{user_x}, $self->{user_y});
+         $self->realloc;
       };
 
    } elsif ($lr ^ $td) {
@@ -958,8 +1102,11 @@
 
          ($x, $y) = ($ev->{x}, $ev->{y});
 
-         $self->move ($bx + $x - $ox, $by + $y - $oy);
-         $self->update;
+         $self->{user_x} = $bx + $x - $ox;
+         $self->{user_y} = $by + $y - $oy;
+
+         $self->move ($self->{user_x}, $self->{user_y});
+         $self->realloc;
       };
    }
 }
@@ -1030,24 +1177,24 @@
 
    $class->SUPER::new (
       col_expand => [],
-      @_
+      @_,
    )
 }
 
+sub children {
+   grep $_, map @$_, grep $_, @{ $_[0]{children} }
+}
+
 sub add {
    my ($self, $x, $y, $child) = @_;
 
    $child->set_parent ($self);
    $self->{children}[$y][$x] = $child;
 
-   $child->check_size;
-}
-
-sub children {
-   grep $_, map @$_, grep $_, @{ $_[0]{children} }
+   $self->realloc;
 }
 
-# TODO: move to container class maybe? send childs a signal on removal?
+# TODO: move to container class maybe? send children a signal on removal?
 sub clear {
    my ($self) = @_;
 
@@ -1059,7 +1206,7 @@
       $_->hide;
    }
 
-   $self->update;
+   $self->realloc;
 }
 
 sub get_wh {
@@ -1096,12 +1243,12 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $w, $h, $changed) = @_;
 
    my ($ws, $hs) = $self->get_wh;
 
-   my $req_w = sum @$ws;
-   my $req_h = sum @$hs;
+   my $req_w = (sum @$ws) || 1;
+   my $req_h = (sum @$hs) || 1;
 
    # TODO: nicer code && do row_expand
    my @col_expand = @{$self->{col_expand}};
@@ -1165,59 +1312,59 @@
 
 #############################################################################
 
-package CFClient::UI::HBox;
-
-# TODO: wrap into common Box base class
+package CFClient::UI::Box;
 
 our @ISA = CFClient::UI::Container::;
 
 sub size_request {
    my ($self) = @_;
 
-   my @alloc = map [$_->size_request], @{$self->{children}};
-
-   (
-      (List::Util::sum map $_->[0], @alloc),
-      (List::Util::max map $_->[1], @alloc),
-   )
+   $self->{vertical}
+      ?  (
+            (List::Util::max map $_->{req_w}, @{$self->{children}}),
+            (List::Util::sum map $_->{req_h}, @{$self->{children}}),
+         )
+      :  (
+            (List::Util::sum map $_->{req_w}, @{$self->{children}}),
+            (List::Util::max map $_->{req_h}, @{$self->{children}}),
+         )
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
-
-   ($h, $w) = ($w, $h);
+   my ($self, $w, $h, $changed) = @_;
 
+   my $space = $self->{vertical} ? $h : $w;
    my $children = $self->{children};
 
-   my @h = map $_->{req_w}, @$children;
+   my @req;
 
-   my $req_h = List::Util::sum @h;
-
-   if ($req_h > $h) {
-      # ah well, not enough space
-      $_ *= $h / $req_h for @h;
+   if ($self->{homogeneous}) {
+      @req = ($space / (@$children || 1)) x @$children;
    } else {
-      my $exp = List::Util::sum map $_->{expand}, @$children;
-      $exp ||= 1;
-      
-      for (0 .. $#$children) {
-         my $child = $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;
+         
+         $space = ($space - $req) / $expand; # remaining space to give away
 
-         my $alloc_h = $h[$_];
-         $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
-         $h[$_] = $alloc_h;
+         $req[$_] += $space * $children->[$_]{expand}
+            for 0 .. $#$children;
       }
    }
 
-   CFClient::UI::harmonize \@h;
+   CFClient::UI::harmonize \@req;
 
-   my $y = 0;
+   my $pos = 0;
    for (0 .. $#$children) {
-      my $child = $children->[$_];
-      my $h = $h[$_];
-      $child->configure ($y, 0, $h, $w);
+      my $alloc = $req[$_];
+      $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
 
-      $y += $h;
+      $pos += $alloc;
    }
 
    1
@@ -1225,60 +1372,32 @@
 
 #############################################################################
 
-package CFClient::UI::VBox;
-
-# TODO: wrap into common Box base class
-
-our @ISA = CFClient::UI::Container::;
+package CFClient::UI::HBox;
 
-sub size_request {
-   my ($self) = @_;
+our @ISA = CFClient::UI::Box::;
 
-   my @alloc = map [$_->size_request], @{$self->{children}};
+sub new {
+   my $class = shift;
 
-   (
-      (List::Util::max map $_->[0], @alloc),
-      (List::Util::sum map $_->[1], @alloc),
+   $class->SUPER::new (
+      vertical => 0,
+      @_,
    )
 }
 
-sub size_allocate {
-   my ($self, $w, $h) = @_;
-
-   Carp::confess "negative size" if $w < 0 || $h < 0;#d#
-
-   my $children = $self->{children};
-
-   my @h = map $_->{req_h}, @$children;
-
-   my $req_h = List::Util::sum @h;
-
-   if ($req_h > $h) {
-      # ah well, not enough space
-      $_ *= $h / $req_h for @h;
-   } else {
-      my $exp = List::Util::sum map $_->{expand}, @$children;
-      $exp ||= 1;
-      
-      for (0 .. $#$children) {
-         my $child = $children->[$_];
-
-         $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
-      }
-   }
+#############################################################################
 
-   CFClient::UI::harmonize \@h;
+package CFClient::UI::VBox;
 
-   my $y = 0;
-   for (0 .. $#$children) {
-      my $child = $children->[$_];
-      my $h = $h[$_];
-      $child->configure (0, $y, $w, $h);
+our @ISA = CFClient::UI::Box::;
 
-      $y += $h;
-   }
+sub new {
+   my $class = shift;
 
-   1
+   $class->SUPER::new (
+      vertical => 1,
+      @_,
+   )
 }
 
 #############################################################################
@@ -1299,6 +1418,8 @@
       #font      => default_font
       #text      => initial text
       #markup    => initial narkup
+      #max_w     => maximum pixel width
+      ellipsise  => 3, # end
       layout     => (new CFClient::Layout),
       fontsize   => 1,
       align      => -1,
@@ -1349,8 +1470,7 @@
    $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
    $self->{layout}->set_text ($text);
 
-   $self->update;
-   $self->check_size;
+   $self->realloc;
 }
 
 sub set_markup {
@@ -1364,8 +1484,7 @@
    $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
    $self->{layout}->set_markup ($markup);
 
-   $self->update;
-   $self->check_size;
+   $self->realloc;
 }
 
 sub size_request {
@@ -1373,6 +1492,8 @@
 
    $self->{layout}->set_font ($self->{font}) if $self->{font};
    $self->{layout}->set_width ($self->{max_w} || -1);
+   $self->{layout}->set_ellipsise ($self->{ellipsise});
+   $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
    $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
 
    my ($w, $h) = $self->{layout}->size;
@@ -1394,9 +1515,10 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $w, $h, $changed) = @_;
 
-   delete $self->{texture};
+   delete $self->{texture}
+      if $changed;
 }
 
 sub set_fontsize {
@@ -1405,8 +1527,7 @@
    $self->{fontsize} = $fontsize;
    delete $self->{texture};
 
-   $self->update;
-   $self->check_size;
+   $self->realloc;
 }
 
 sub _draw {
@@ -1418,7 +1539,9 @@
       $self->{layout}->set_foreground (@{$self->{fg}});
       $self->{layout}->set_font ($self->{font}) if $self->{font};
       $self->{layout}->set_width ($self->{w});
-      $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
+      $self->{layout}->set_ellipsise ($self->{ellipsise});
+      $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
+      $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
 
       my $tex = new_from_layout CFClient::Texture $self->{layout};
 
@@ -1466,6 +1589,7 @@
       can_focus  => 1,
       valign     => 0,
       can_events => 1,
+      #text      => ...
       @_
    )
 }
@@ -1485,7 +1609,7 @@
    $text =~ s/./*/g if $self->{hidden};
    $self->{layout}->set_text ("$text ");
 
-   $self->emit (changed => $self->{text});
+   $self->_emit (changed => $self->{text});
 }
 
 sub set_text {
@@ -1493,8 +1617,8 @@
 
    $self->{cursor} = length $text;
    $self->_set_text ($text);
-   $self->update;
-   $self->check_size;
+
+   $self->realloc;
 }
 
 sub get_text {
@@ -1509,12 +1633,6 @@
    ($w + 1, $h) # add 1 for cursor
 }
 
-sub size_allocate {
-   my ($self, $w, $h) = @_;
-
-   $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
-}
-
 sub key_down {
    my ($self, $ev) = @_;
 
@@ -1537,14 +1655,14 @@
    } elsif ($sym == CFClient::SDLK_END) {
       $self->{cursor} = length $text;
    } elsif ($uni == 27) {
-      $self->emit ('escape');
+      $self->_emit ('escape');
    } elsif ($uni) {
       substr $text, $self->{cursor}++, 0, chr $uni;
    }
 
    $self->_set_text ($text);
-   $self->update;
-   $self->check_size;
+
+   $self->realloc;
 }
 
 sub focus_in {
@@ -1634,7 +1752,7 @@
          my $txt = $self->get_text;
       $self->{history_pointer} = -1;
       $self->{history_saveback} = '';
-      $self->emit (activate => $txt);
+      $self->_emit (activate => $txt);
       $self->update;
 
    } elsif ($sym == CFClient::SDLK_UP) {
@@ -1692,13 +1810,14 @@
    )
 }
 
+sub activate { }
+
 sub button_up {
    my ($self, $ev, $x, $y) = @_;
 
-   if ($x >= 0 && $x < $self->{w}
-       && $y >= 0 && $y < $self->{h}) {
-      $self->emit ("activate");
-   }
+   $self->emit ("activate")
+      if $x >= 0 && $x < $self->{w}
+         && $y >= 0 && $y < $self->{h};
 }
 
 sub _draw {
@@ -1760,7 +1879,7 @@
    if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
        && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
       $self->{state} = !$self->{state};
-      $self->emit (changed => $self->{state});
+      $self->_emit (changed => $self->{state});
    }
 }
 
@@ -2045,12 +2164,12 @@
       active_fg => [0, 0, 0],
       bg        => [0, 0, 0, 0.2],
       active_bg => [1, 1, 1, 0.5],
-      range     => [0, 0, 100, 10],
+      range     => [0, 0, 100, 10, 0],
       req_w     => $::WIDTH / 80,
       req_h     => $::WIDTH / 80,
       vertical  => 0,
       can_hover => 1,
-      inner_pad => .05,
+      inner_pad => 0.02,
       @_
    );
 
@@ -2060,6 +2179,17 @@
    $self
 }
 
+sub changed { }
+
+sub set_range {
+   my ($self, $range) = @_;
+
+   ($range, $self->{range}) = ($self->{range}, $range);
+
+   $self->update
+      if "@$range" ne "@{$self->{range}}";
+}
+
 sub set_value {
    my ($self, $value) = @_;
 
@@ -2067,18 +2197,18 @@
 
    $hi = $lo + 1 if $hi <= $lo;
 
-   $value = $lo if $value < $lo;
-   $value = $hi if $value > $hi;
+   $page = $hi - $lo if $page > $hi - $lo;
+
+   $value = $lo         if $value < $lo;
+   $value = $hi - $page if $value > $hi - $page;
 
    $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
       if $unit;
 
-   $page = $hi - $lo if $page > $hi - $lo;
-
    @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
 
    if ($value != $old_value) {
-      $self->emit (changed => $value);
+      $self->_emit (changed => $value);
       $self->update;
    }
 }
@@ -2096,6 +2226,9 @@
    my ($self, $ev, $x, $y) = @_;
 
    $self->SUPER::button_down ($ev, $x, $y);
+
+   $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
+   
    $self->mouse_motion ($ev, $x, $y);
 }
 
@@ -2107,9 +2240,9 @@
 
       my (undef, $lo, $hi, $page) = @{$self->{range}};
 
-      $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
+      $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
 
-      $self->set_value ($x * ($hi - $lo) + $lo);
+      $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
    }
 }
 
@@ -2120,21 +2253,18 @@
       $self->set_value ($self->{range}[0]);
 
       my ($value, $lo, $hi, $page) = @{$self->{range}};
+      my $range = ($hi - $page - $lo) || 1e-100;
 
-      my $inner_w = 1 - 2 * $self->{inner_pad};
+      my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
 
-      $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
+      $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
+      $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
 
-      $page  = $self->{scale} * $page || 10 / ($self->{w} || 1);
-      $value = $self->{scale} * ($value - $lo);
+      $value = ($value - $lo) / $range;
+      $value = $value * $self->{scale} + $self->{offset};
 
-      $value = $self->{inner_pad} + ($value - $page * 0.5);
-
-      $value = 0 if $value < 0;
-      $page  = 1 - $value if $value + $page > 1;
-
-      $self->{knob_x} = $value;
-      $self->{knob_w} = $page;
+      $self->{knob_x} = $value - $knob_w * 0.5;
+      $self->{knob_w} = $knob_w;
    });
 
    $self->SUPER::update;
@@ -2150,8 +2280,8 @@
    if ($self->{vertical}) {
       # draw a vertical slider like a rotated horizontal slider
  
+      glTranslate 1, 0, 0;
       glRotate 90, 0, 0, 1;
-      glTranslate 0, 1, 0;
    }
 
    my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
@@ -2171,6 +2301,47 @@
 
 #############################################################################
 
+package CFClient::UI::ValSlider;
+
+our @ISA = CFClient::UI::HBox::;
+
+sub new {
+   my ($class, %arg) = @_;
+
+   my $range = delete $arg{range};
+
+   my $self = $class->SUPER::new (
+      slider     => (new CFClient::UI::Slider expand => 1, range => $range),
+      entry      => (new CFClient::UI::Label text => "", template => delete $arg{template}),
+      to_value   => sub { shift },
+      from_value => sub { shift },
+      %arg,
+   );
+
+   $self->{slider}->connect (changed => sub {
+      my ($self, $value) = @_;
+      $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
+      $self->{parent}->emit (changed => $value);
+   });
+
+#   $self->{entry}->connect (changed => sub {
+#      my ($self, $value) = @_;
+#      $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
+#      $self->{parent}->emit (changed => $value);
+#   });
+
+   $self->add ($self->{slider}, $self->{entry});
+
+   $self->{slider}->emit (changed => $self->{slider}{range}[0]);
+
+   $self
+}
+
+sub set_range { shift->{slider}->set_range (@_) }
+sub set_value { shift->{slider}->set_value (@_) }
+
+#############################################################################
+
 package CFClient::UI::TextView;
 
 our @ISA = CFClient::UI::HBox::;
@@ -2207,16 +2378,30 @@
    $self->reflow;
 }
 
-sub text_height {
-   my ($self, $text) = @_;
+sub size_allocate {
+   my ($self, $w, $h, $changed) = @_;
+
+   $self->SUPER::size_allocate ($w, $h, $changed);
+
+   return unless $changed;
+
+   $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->reflow;
+}
+
+sub text_size {
+   my ($self, $text, $indent) = @_;
 
    my $layout = $self->{layout};
 
    $layout->set_height ($self->{fontsize} * $::FONTSIZE);
-   $layout->set_width ($self->{children}[0]{w});
+   $layout->set_width ($self->{children}[0]{w} - $indent);
    $layout->set_markup ($text);
    
-   ($layout->size)[1]
+   $layout->size
 }
 
 sub reflow {
@@ -2226,31 +2411,31 @@
    $self->update;
 }
 
-sub size_allocate {
-   my ($self, $w, $h) = @_;
+sub set_offset {
+   my ($self, $offset) = @_;
 
-   $self->SUPER::size_allocate ($w, $h);
+   # todo: base offset on lines or so, not on pixels
+   $self->{children}[1]->set_value ($offset);
+}
 
-   $self->{layout}->set_font ($self->{font}) if $self->{font};
-   $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
-   $self->{layout}->set_width ($self->{children}[0]{w});
+sub clear {
+   my ($self) = @_;
 
-   $self->reflow;
+   $self->{par} = [];
+   $self->{height} = 0;
+   $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
 }
 
 sub add_paragraph {
-   my ($self, $color, $text) = @_;
-
-   #TODO: intelligently "reformat" paragraph
-
-   my $height = $self->text_height ($text);
-
-   $self->{height} += $height;
+   my ($self, $color, $text, $indent) = @_;
 
-   push @{$self->{par}}, [$height, $color, $text];
+   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];
+   }
 
-   $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
-   $self->{children}[1]->update;
+   $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
 }
 
 sub update {
@@ -2263,30 +2448,42 @@
    delete $self->{texture};
 
    $ROOT->on_post_alloc ($self, sub {
+      my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
+
       if (delete $self->{need_reflow}) {
          my $height = 0;
 
-         $height += $_->[0] = $self->text_height ($_->[2])
-            for @{$self->{par}};
+         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_markup ($_->[4]);
+               my ($w, $h) = $layout->size;
+               $_->[0] = $w + $_->[3];
+               $_->[1] = $h;
+            }
+
+            $height += $_->[1];
+         }
 
          $self->{height} = $height;
 
-         $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
+         $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
          
          delete $self->{texture};
       }
 
-      $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
-         glClearColor 0, 0, 0, 0;
+      $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
+         glClearColor 0.5, 0.5, 0.5, 0;
          glClear GL_COLOR_BUFFER_BIT;
 
-         glEnable GL_TEXTURE_2D;
-         glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-
          my $top = int $self->{children}[1]{range}[0];
 
          my $y0 = $top;
-         my $y1 = $top + $self->{h};
+         my $y1 = $top + $H;
 
          my $y = 0;
 
@@ -2294,21 +2491,28 @@
 
          $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->[0];
+            my $h = $par->[1];
 
             if ($y0 < $y + $h && $y < $y1) {
-               $layout->set_foreground (@{ $par->[1] });
-               $layout->set_markup ($par->[2]);
+               $layout->set_foreground (@{ $par->[2] });
+               $layout->set_width ($W - $par->[3]);
+               $layout->set_markup ($par->[4]);
+
+               my ($w, $h, $data, $format, $internalformat) = $layout->render;
 
-               my ($W, $H) = $layout->size;
-               CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
+               glRasterPos $par->[3], $y - $y0;
+               glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
             }
 
             $y += $h;
          }
 
-         glDisable GL_TEXTURE_2D;
+         glDisable GL_BLEND;
       };
    });
 }
@@ -2319,7 +2523,7 @@
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
    glColor 1, 1, 1, 1;
-   $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
+   $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
    glDisable GL_TEXTURE_2D;
 
    $self->{children}[1]->draw;
@@ -2378,33 +2582,18 @@
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      state            => 0,
-      connect_activate => \&toggle_flopper,
+      state       => 0,
+      on_activate => \&toggle_flopper,
       @_
    );
 
-   if ($self->{state}) {
-      $self->{state} = 0;
-      $self->toggle_flopper;
-   }
-
    $self
 }
 
 sub toggle_flopper {
    my ($self) = @_;
 
-   # TODO: use animation
-   if ($self->{state} = !$self->{state}) {
-      $CFClient::UI::ROOT->add ($self->{other});
-      $self->{other}->move ($self->coord2global (0, $self->{h}));
-      $self->emit ("open");
-   } else {
-      $CFClient::UI::ROOT->remove ($self->{other});
-      $self->emit ("close");
-   }
-
-   $self->emit (changed => $self->{state});
+   $self->{other}->toggle_visibility;
 }
 
 #############################################################################
@@ -2428,11 +2617,12 @@
    my ($self, $widget) = @_;
 
    $self->add (new CFClient::UI::Label
-      markup   => $widget->{tooltip},
-      max_w    => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
-      fontsize => 0.8,
-      fg       => [0, 0, 0, 1],
-      font     => ($widget->{tooltip_font} || $::FONT_PROP),
+      markup    => $widget->{tooltip},
+      max_w     => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
+      fontsize  => 0.8,
+      fg        => [0, 0, 0, 1],
+      ellipsise => 0,
+      font      => ($widget->{tooltip_font} || $::FONT_PROP),
    );
 }
 
@@ -2445,9 +2635,11 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $w, $h, $changed) = @_;
 
-   $self->SUPER::size_allocate ($w - 4, $h - 4);
+   return unless $changed;
+
+   $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
 }
 
 sub _draw {
@@ -2488,23 +2680,57 @@
 sub new {
    my $class = shift;
 
-   $class->SUPER::new (
-      aspect => 1,
+   my $self = $class->SUPER::new (
+      aspect     => 1,
+      can_events => 0,
       @_,
-   )
+   );
+
+   if ($self->{anim} && $self->{animspeed}) {
+      Scalar::Util::weaken (my $widget = $self);
+
+      $self->{timer} = Event->timer (
+         at       => $self->{animspeed} * int $::NOW / $self->{animspeed},
+         hard     => 1,
+         interval => $self->{animspeed},
+         cb       => sub {
+            ++$widget->{frame};
+            $widget->update;
+         },
+      );
+   }
+   
+   $self
 }
 
 sub size_request {
    (32, 8)
 }
 
+sub update {
+   my ($self) = @_;
+
+   return unless $self->{visible};
+
+   $self->SUPER::update;
+}
+
 sub _draw {
    my ($self) = @_;
 
-   return unless $::CONN;#d# manage and cache textures differently
-   my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
+   return unless $::CONN;
+
+   my $face;
+
+   if ($self->{frame}) {
+      my $anim = $::CONN->{anim}[$self->{anim}];
+
+      $face = $anim->[ $self->{frame} % @$anim ]
+         if $anim && @$anim;
+   }
+   
+   my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
 
-   # TODO animation
    if ($tex) {
       glEnable GL_TEXTURE_2D;
       glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
@@ -2514,109 +2740,13 @@
    }
 }
 
-#############################################################################
-
-package CFClient::UI::InventoryItem;
-
-our @ISA = CFClient::UI::HBox::;
-
-sub _item_to_desc {
-   my ($item) = @_;
-
-   my $desc =
-      $item->{nrof} < 2
-         ? $item->{name}
-         : "$item->{nrof} $item->{name_pl}";
-
-   $item->{flags} & Crossfire::Protocol::F_OPEN
-      and $desc .= " (open)";
-   $item->{flags} & Crossfire::Protocol::F_APPLIED
-      and $desc .= " (applied)";
-   $item->{flags} & Crossfire::Protocol::F_UNPAID
-      and $desc .= " (unpaid)";
-   $item->{flags} & Crossfire::Protocol::F_MAGIC
-      and $desc .= " (magic)";
-   $item->{flags} & Crossfire::Protocol::F_CURSED
-      and $desc .= " (cursed)";
-   $item->{flags} & Crossfire::Protocol::F_DAMNED
-      and $desc .= " (damned)";
-   $item->{flags} & Crossfire::Protocol::F_LOCKED
-      and $desc .= " *";
-
-   $desc
-}
-
-sub new {
-   my $class = shift;
-
-   my %args = @_;
-
-   my $item = delete $args{item};
-
-   my $desc = _item_to_desc ($item);
-
-   my $self = $class->SUPER::new (
-      can_hover => 1,
-      can_events => 1,
-      tooltip => ((CFClient::UI::Label::escape $desc)
-                 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
-      connect_button_down => sub {
-         my ($self, $ev, $x, $y) = @_;
-
-         # todo: maybe put examine on 1? but should just be a tooltip :(
-         if ($ev->{button} == 1) {
-            my $targ = $::CONN->{player}{tag};
-
-            if ($item->{container} == $::CONN->{player}{tag}) {
-               $targ = $main::OPENCONT;
-            }
-
-            $::CONN->send ("move $targ $item->{tag} 0");
-         } elsif ($ev->{button} == 2) {
-            $::CONN->send ("apply $item->{tag}");
-         } elsif ($ev->{button} == 3) {
-            my @menu_items = (
-               ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
-               ["mark",    sub { $::CONN->send ("mark $item->{tag}") }],
-               ["apply",   sub { $::CONN->send ("apply $item->{tag}") }],
-               ["drop",    sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
-               [
-                  $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
-                  sub { $::CONN->send ("lock $item->{tag}") }, 
-               ],
-            );
-
-            CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
-         }
-
-         1
-      },
-      %args
-   );
-
-
-   $self->add (new CFClient::UI::Face
-      can_events => 0,
-      face       => $item->{face},
-      anim       => $item->{anim},
-      animspeed  => $item->{animspeed},
-   );
-
-   $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
-
-   $self->{item} = $item;
-
-   $self->update_item;
-
-   $self
-}
-
-sub update_item {
+sub DESTROY {
    my ($self) = @_;
 
-   my $desc = _item_to_desc ($self->{item});
+   $self->{timer}->cancel
+      if $self->{timer};
 
-   $self->{name_lbl}->set_text ($desc);
+   $self->SUPER::DESTROY;
 }
 
 #############################################################################
@@ -2629,7 +2759,7 @@
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      scrolled => (new CFClient::UI::VBox),
+      scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
       @_,
    );
 
@@ -2649,19 +2779,16 @@
 
    $self->{real_items} = \@items;
 
+   my $row = 0;
    for my $item (@items) {
-      $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
-      $item->update_item ();
-   }
+      CFClient::Item::update_widgets $item;
 
-   $self->{scrolled}->add (@items);
+      $self->{scrolled}->add (0, $row, $item->{face_widget});
+      $self->{scrolled}->add (1, $row, $item->{desc_widget});
+      $self->{scrolled}->add (2, $row, $item->{weight_widget});
 
-#   $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
-}
-
-sub size_request {
-   my ($self) = @_;
-   ($self->{req_w}, $self->{req_h});
+      $row++;
+   }
 }
 
 #############################################################################
@@ -2706,7 +2833,7 @@
 sub popup {
    my ($self, $ev) = @_;
 
-   $self->emit ("popdown");
+   $self->_emit ("popdown");
 
    # maybe save $GRAB? must be careful about events...
    $GRAB = $self;
@@ -2731,7 +2858,7 @@
       undef $GRAB;
       $self->hide;
 
-      $self->emit ("popdown");
+      $self->_emit ("popdown");
       $self->{hover}[1]->() if $self->{hover};
    }
 }
@@ -2776,13 +2903,9 @@
                      ? "<b>$item->{count} ×</b> $item->{text}"
                      : $item->{text};
 
-         my $fontsize = $item->{fontsize} || $self->{fontsize};
-
          for ($short) {
             s/^\s+//;
             s/\s+/ /g;
-            my $len = int 40 / $fontsize;
-            substr $_, $len, length, "…" if $len < length;
          }
 
          new CFClient::UI::Label
@@ -2790,7 +2913,8 @@
             tooltip       => $item->{tooltip},
             tooltip_font  => $::FONT_PROP,
             tooltip_width => 0.67,
-            fontsize      => $fontsize,
+            fontsize      => $item->{fontsize} || $self->{fontsize},
+            max_w         => $::WIDTH * 0.44,
             fg            => $item->{fg},
             can_events    => 1,
             can_hover     => 1
@@ -2807,6 +2931,8 @@
    $text =~ s/^\s+//;
    $text =~ s/\s+$//;
 
+   return unless $text;
+
    my $timeout = time + ((delete $arg{timeout}) || 60);
 
    my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
@@ -2837,6 +2963,16 @@
    $self->reorder;
 }
 
+sub reconfigure {
+   my ($self) = @_;
+
+   delete $_->{label}
+      for values %{ $self->{item} || {} };
+
+   $self->reorder;
+   $self->SUPER::reconfigure;
+}
+
 #############################################################################
 
 package CFClient::UI::Root;
@@ -2848,9 +2984,14 @@
 sub new {
    my $class = shift;
 
-   $class->SUPER::new (
+   my $self = $class->SUPER::new (
+      visible => 1,
       @_,
-   )
+   );
+
+   Scalar::Util::weaken ($self->{root} = $self);
+
+   $self
 }
 
 sub configure {
@@ -2860,10 +3001,12 @@
    $self->{h} = $h;
 }
 
-sub check_size {
+sub reconfigure {
    my ($self) = @_;
 
-   $self->size_allocate ($self->{w}, $self->{h})
+   $self->SUPER::reconfigure;
+
+   $self->size_allocate ($self->{w}, $self->{h}, 1)
       if $self->{w};
 }
 
@@ -2874,13 +3017,7 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
-
-   my $old_w = $self->{old_w}; $self->{old_w} = $w;
-   my $old_h = $self->{old_h}; $self->{old_h} = $h;
-
-   CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
-      if $old_w && $old_h && ($old_w != $w || $old_h != $h);
+   my ($self, $w, $h, $changed) = @_;
 
    for my $child ($self->children) {
       my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
@@ -2891,6 +3028,8 @@
       $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
          if exists $child->{req_y};
 
+      #delete @$child{qw(req_x req_y)};#d# def_x, def_y
+
       $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
       $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
 
@@ -2913,7 +3052,6 @@
 sub update {
    my ($self) = @_;
 
-   $self->check_size;
    $::WANT_REFRESH++;
 }
 
@@ -2921,7 +3059,7 @@
    my ($self, @children) = @_;
 
    for my $child (@children) {
-      $child->{toplevel} = 1;
+      $child->{is_toplevel} = 1;
 
       # integerise window positions
       $child->{x} = int $child->{x};
@@ -2931,6 +3069,18 @@
    $self->SUPER::add (@children);
 }
 
+sub remove {
+   my ($self, @children) = @_;
+
+   $self->SUPER::remove (@children);
+
+   while (@children) {
+      my $w = pop @children;
+      push @children, $w->children;
+      $w->set_invisible;
+   }
+}
+
 sub on_refresh {
    my ($self, $id, $cb) = @_;
 
@@ -2951,48 +3101,50 @@
          for values %{delete $self->{refresh_hook}};
    }
 
-   if ($self->{check_size}) {
-      my @queue = ([], []);
+   if ($self->{realloc}) {
+      my @queue;
+
+      while () {
+         if ($self->{realloc}) {
+            #TODO use array-of-depth approach
 
-      for (;;) {
-         if ($self->{check_size}) {
-            # heuristic: check containers last
-            push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
-               for values %{delete $self->{check_size}}
+            @queue = sort { $a->{visible} <=> $b->{visible} }
+                          @queue, values %{delete $self->{realloc}};
          }
 
-         my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
+         my $widget = pop @queue || last;
 
-         my ($w, $h) = $widget->{user_w} && $widget->{user_h}
-            ? @$widget{qw(user_w user_h)}
+         $widget->{visible} or last; # do not resize invisible widgets
+
+         my ($w, $h) = $widget->{def_w} && $widget->{def_h}
+            ? @$widget{qw(def_w def_h)}
             : $widget->size_request;
 
-         if (delete $widget->{force_alloc}
-             or $w != $widget->{req_w} or $h != $widget->{req_h}) {
-            Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
+         Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
             
-            $widget->{req_w} = $w;
-            $widget->{req_h} = $h;
+         $widget->{req_w} = $w;
+         $widget->{req_h} = $h;
 
-            $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
+         $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
 
-            $widget->{parent}->check_size
-               if $widget->{parent};
-         }
+         push @queue, $widget->{parent}
+            if $widget->{parent};
        }
    }
 
-   while ($self->{size_alloc}) {
-      for (values %{delete $self->{size_alloc}}) {
-         my ($widget, $w, $h) = @$_;
+   while (my $size_alloc = delete $self->{size_alloc}) {
+      my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
+                       values %$size_alloc;
+
+      while () {
+         my ($widget, $w, $h) = @{ pop @queue or last };
 
          $w = 0 if $w < 0;
          $h = 0 if $h < 0;
 
          $widget->{w} = $w;
          $widget->{h} = $h;
-         $widget->size_allocate ($w, $h);
-         $widget->emit (size_allocate => $w, $h);
+         $widget->emit (size_allocate => $w, $h, 1);
       }
    }
 
@@ -3007,7 +3159,7 @@
 
    glMatrixMode GL_PROJECTION;
    glLoadIdentity;
-   glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
+   glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
    glMatrixMode GL_MODELVIEW;
    glLoadIdentity;
 
@@ -3019,7 +3171,7 @@
 package CFClient::UI;
 
 $ROOT = new CFClient::UI::Root;
-$TOOLTIP = new CFClient::UI::Tooltip;
+$TOOLTIP = new CFClient::UI::Tooltip z => 900;
 
 1