--- deliantra/Deliantra-Client/DC/UI.pm	2006/05/22 03:48:50	1.221
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/05/30 01:42:16	1.256
@@ -7,21 +7,45 @@
 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 {
+   my $layout;
+
+   for (grep { $_->{name} } values %WIDGET) {
+      my $win = $layout->{$_->{name}} = { };
+      
+      $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH   if $_->{x} =~ /^[0-9.]+$/;
+      $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT  if $_->{y} =~ /^[0-9.]+$/;
+      $win->{w} = $_->{w} / $::WIDTH                     if defined $_->{w};
+      $win->{h} = $_->{h} / $::HEIGHT                    if defined $_->{h};
+   }
+
+   $layout
+}
+
+sub set_layout {
+   my ($layout) = @_;
+   $LAYOUT = $layout;
+}
+
 sub check_tooltip {
    if (!$GRAB) {
       for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
          if (length $widget->{tooltip}) {
 
             if ($TOOLTIP->{owner} != $widget) {
+               $TOOLTIP->hide;
+
                $TOOLTIP->{owner} = $widget;
 
                my $tip = $widget->{tooltip};
@@ -30,15 +54,6 @@
                
                $TOOLTIP->set_tooltip_from ($widget);
                $TOOLTIP->show;
-
-               my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
-
-               ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
-                  if $x + $TOOLTIP->{w} > $::WIDTH;
-
-               $TOOLTIP->move ($x, $y);
-               $TOOLTIP->check_size;
-               $TOOLTIP->update;
             }
 
             return;
@@ -52,12 +67,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 +91,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 +103,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 +130,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
@@ -146,27 +155,37 @@
       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) = @_;
 
-   # make a copy, otherwise for complains about freed values.
-   my @widgets = values %WIDGET;
+   for my $widget (values %WIDGET) {
+      if ($widget->{is_toplevel}) {
+         $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
+         $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
+
+         $widget->{x}       = int 0.5 + $widget->{x}        * $sx if $widget->{x} =~ /^[0-9.]+$/;
+         $widget->{w}       = int 0.5 + $widget->{w}        * $sx if exists $widget->{w};
+         $widget->{force_w} = int 0.5 + $widget->{force_w}  * $sx if exists $widget->{force_w};
+         $widget->{y}       = int 0.5 + $widget->{y}        * $sy if $widget->{y} =~ /^[0-9.]+$/;
+         $widget->{h}       = int 0.5 + $widget->{h}        * $sy if exists $widget->{h};
+         $widget->{force_h} = int 0.5 + $widget->{force_h}  * $sy if exists $widget->{force_h};
 
-   for my $widget (@widgets) {
-      if ($widget->{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->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
+         $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
 
-      $widget->reconfigure;
+      }
    }
+
+   reconfigure_widgets;
 }
 
 #############################################################################
@@ -181,21 +200,33 @@
    my $class = shift;
 
    my $self = bless {
-      x          => 0,
-      y          => 0,
+      x          => "center",
+      y          => "center",
       z          => 0,
+      w          => undef,
+      h          => undef,
       can_events => 1,
       @_
    }, $class;
 
+   if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
+      $self->{x}       = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
+      $self->{y}       = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
+      $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
+      $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
+
+      $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
+      $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
+   }
+
+   Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
+
    for (keys %$self) {
-      if (/^connect_(.*)$/) {
+      if (/^on_(.*)$/) {
          $self->connect ($1 => delete $self->{$_});
       }
    }
 
-   Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
-
    $self
 }
 
@@ -209,38 +240,78 @@
 sub show {
    my ($self) = @_;
 
-   for (my @w = $self; @w; ) {
-      my $w = pop @w;
-      push @w, $w->children;
-      $w->{visible} = 1;
-   }
-
    return if $self->{parent};
 
    $CFClient::UI::ROOT->add ($self);
 }
 
-sub hide {
+sub set_visible {
    my ($self) = @_;
 
-   for (my @w = $self; @w; ) {
-      my $w = pop @w;
-      push @w, $w->children;
-      $w->{visible} = 1;
-   }
+   return if $self->{visible};
+
+   $self->{root}    = $self->{parent}{root};
+   $self->{visible} = $self->{parent}{visible} + 1;
+
+   $self->emit (visibility_change => 1);
+
+   $self->realloc if !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};
 }
 
-sub move {
+sub move_abs {
    my ($self, $x, $y, $z) = @_;
 
-   $self->{x} = int $x;
-   $self->{y} = int $y;
+   $self->{x} = List::Util::max 0, int $x;
+   $self->{y} = List::Util::max 0, int $y;
    $self->{z} = $z if defined $z;
 
    $self->update;
@@ -249,10 +320,10 @@
 sub set_size {
    my ($self, $w, $h) = @_;
 
-   $self->{user_w} = $w;
-   $self->{user_h} = $h;
+   $self->{force_w} = $w;
+   $self->{force_h} = $h;
 
-   $self->check_size;
+   $self->realloc;
 }
 
 sub size_request {
@@ -264,25 +335,27 @@
    my ($self, $x, $y, $w, $h) = @_;
 
    if ($self->{aspect}) {
-      my $w2 = List::Util::min $w, int $h * $self->{aspect};
-      my $h2 = List::Util::min $h, int $w / $self->{aspect};
+      my ($ow, $oh) = ($w, $h);
 
-      # use alignment to adjust x, y
+      $w = List::Util::min $w, int $h * $self->{aspect};
+      $h = List::Util::min $h, int $w / $self->{aspect};
 
-      $x += int +($w - $w2) * 0.5;
-      $y += int +($h - $h2) * 0.5;
+      # use alignment to adjust x, y
 
-      ($w, $h) = ($w2, $h2);
+      $x += int 0.5 * ($ow - $w);
+      $y += int 0.5 * ($oh - $h);
    }
 
-   if ($self->{x} != $x || $self->{y} != $y) {
+   if ($self->{x} ne $x || $self->{y} ne $y) {
       $self->{x} = $x;
       $self->{y} = $y;
       $self->update;
    }
 
    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];
    }
 }
 
@@ -290,13 +363,6 @@
    # nothing to be done
 }
 
-sub reconfigure {
-   my ($self) = @_;
-
-   $self->check_size (1);
-   $self->update;
-}
-
 sub children {
 }
 
@@ -310,6 +376,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) {
@@ -340,7 +411,7 @@
 
    my $focus = $FOCUS; $FOCUS = $self;
 
-   $self->emit (focus_in => $focus);
+   $self->_emit (focus_in => $focus);
 
    $focus->update if $focus;
    $FOCUS->update;
@@ -353,15 +424,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) = @_;
@@ -375,6 +449,76 @@
 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};
+}
+
+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) = @_;
+
+   if ($self->{visible}) {
+      return if $self->{root}{realloc}{$self};
+
+      $self->{root}{realloc}{$self} = $self;
+      $self->{root}->update;
+   } else {
+      delete $self->{req_w};
+   }
+}
+
+sub update {
+   my ($self) = @_;
+
+   $self->{parent}->update
+      if $self->{parent};
+}
+
+sub reconfigure {
+   my ($self) = @_;
+
+   $self->realloc;
+   $self->update;
+}
+
 sub draw {
    my ($self) = @_;
 
@@ -400,15 +544,15 @@
       glDisable GL_BLEND;
    }
 
-   if ($ENV{PCLIENT_DEBUG}) {
+   if ($ENV{CFPLUS_DEBUG}) {
       glPushMatrix;
       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;
@@ -421,56 +565,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};
-
-   $self->show;
-}
-
-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) = @_;
 
@@ -536,7 +630,9 @@
 }
 
 sub size_request {
-   (0, 0)
+   my ($self) = @_;
+
+   ($self->{w} + 0, $self->{h} + 0)
 }
 
 sub draw { }
@@ -575,8 +671,7 @@
          @{$self->{children}}, @widgets
    ];
 
-   $self->check_size (1);
-   $self->update;
+   $self->realloc;
 }
 
 sub children {
@@ -591,8 +686,7 @@
 
    $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
 
-   $self->check_size;
-   $self->update;
+   $self->realloc;
 }
 
 sub clear {
@@ -606,8 +700,7 @@
       $_->hide;
    }
 
-   $self->check_size;
-   $self->update;
+   $self->realloc;
 }
 
 sub find_widget {
@@ -670,7 +763,7 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $w, $h, $changed) = @_;
 
    $self->{children}[0]->configure (0, 0, $w, $h);
 }
@@ -697,10 +790,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 {
@@ -741,18 +835,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)};
+
+   $w = 10 if $self->{scroll_x};
+   $h = 10 if $self->{scroll_y};
 
-   @$self{qw(child_w child_h)}
+   ($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;
 }
 
@@ -813,10 +923,10 @@
    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]);
       },
    ;
 
@@ -833,6 +943,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
 
@@ -884,21 +1013,23 @@
 
 use CFClient::OpenGL;
 
-my @tex = 
+my $bg = 
+      new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
+         mipmap => 1, wrap => 1;
+
+my @border = 
       map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
-         qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
+         qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
 
 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,
       @_
    );
 
@@ -927,7 +1058,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;
@@ -961,10 +1094,11 @@
          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->{force_w} = $bw + $dx * ($mx ? -1 : 1);
+         $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
+
+         $self->realloc;
+         $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
       };
 
    } elsif ($lr ^ $td) {
@@ -976,8 +1110,7 @@
 
          ($x, $y) = ($ev->{x}, $ev->{y});
 
-         $self->move ($bx + $x - $ox, $by + $y - $oy);
-         $self->update;
+         $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
       };
    }
 }
@@ -1006,23 +1139,18 @@
    my $border = $self->border;
 
    glColor @{ $self->{border_bg} };
-   $tex[1]->draw_quad_alpha (0, 0, $w, $border);
-   $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
-   $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
-   $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
+   $border[0]->draw_quad_alpha (0, 0, $w, $border);
+   $border[1]->draw_quad_alpha (0, $border, $border, $ch);
+   $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
+   $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
 
    if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
-      my $bg = $tex[0];
-
-      # TODO: repeat texture not scale
-      my $rep_x = $cw / $bg->{w};
-      my $rep_y = $ch / $bg->{h};
-
       glColor @{ $self->{bg} };
 
-      $bg->{s} = $rep_x;
-      $bg->{t} = $rep_y;
-      $bg->{wrap_mode} = 1;
+      # TODO: repeat texture not scale
+      # solve this better(?)
+      $bg->{s} = $cw / $bg->{w};
+      $bg->{t} = $ch / $bg->{h};
       $bg->draw_quad_alpha ($border, $border, $cw, $ch);
    }
 
@@ -1048,24 +1176,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;
+   $self->realloc;
 }
 
-sub children {
-   grep $_, map @$_, grep $_, @{ $_[0]{children} }
-}
-
-# 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) = @_;
 
@@ -1077,7 +1205,7 @@
       $_->hide;
    }
 
-   $self->update;
+   $self->realloc;
 }
 
 sub get_wh {
@@ -1114,12 +1242,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}};
@@ -1183,59 +1311,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_h = List::Util::sum @h;
+   my @req;
 
-   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
@@ -1243,60 +1371,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,
+      @_,
+   )
 }
 
 #############################################################################
@@ -1369,8 +1469,8 @@
    $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
    $self->{layout}->set_text ($text);
 
+   $self->realloc;
    $self->update;
-   $self->check_size;
 }
 
 sub set_markup {
@@ -1384,8 +1484,8 @@
    $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
    $self->{layout}->set_markup ($markup);
 
+   $self->realloc;
    $self->update;
-   $self->check_size;
 }
 
 sub size_request {
@@ -1416,9 +1516,10 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $w, $h, $changed) = @_;
 
-   delete $self->{texture};
+   delete $self->{texture}
+      if $changed;
 }
 
 sub set_fontsize {
@@ -1427,8 +1528,7 @@
    $self->{fontsize} = $fontsize;
    delete $self->{texture};
 
-   $self->update;
-   $self->check_size;
+   $self->realloc;
 }
 
 sub _draw {
@@ -1490,6 +1590,7 @@
       can_focus  => 1,
       valign     => 0,
       can_events => 1,
+      #text      => ...
       @_
    )
 }
@@ -1509,7 +1610,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 {
@@ -1517,8 +1618,8 @@
 
    $self->{cursor} = length $text;
    $self->_set_text ($text);
-   $self->update;
-   $self->check_size;
+
+   $self->realloc;
 }
 
 sub get_text {
@@ -1533,12 +1634,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) = @_;
 
@@ -1561,14 +1656,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 {
@@ -1658,7 +1753,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) {
@@ -1716,13 +1811,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 {
@@ -1784,7 +1880,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});
    }
 }
 
@@ -2069,7 +2165,7 @@
       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,
@@ -2084,6 +2180,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) = @_;
 
@@ -2091,18 +2198,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;
    }
 }
@@ -2120,6 +2227,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);
 }
 
@@ -2131,9 +2241,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));
    }
 }
 
@@ -2144,21 +2254,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;
@@ -2195,6 +2302,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::;
@@ -2232,9 +2380,11 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $w, $h, $changed) = @_;
 
-   $self->SUPER::size_allocate ($w, $h);
+   $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);
@@ -2243,7 +2393,7 @@
    $self->reflow;
 }
 
-sub text_height {
+sub text_size {
    my ($self, $text, $indent) = @_;
 
    my $layout = $self->{layout};
@@ -2252,7 +2402,7 @@
    $layout->set_width ($self->{children}[0]{w} - $indent);
    $layout->set_markup ($text);
    
-   ($layout->size)[1]
+   $layout->size
 }
 
 sub reflow {
@@ -2262,19 +2412,31 @@
    $self->update;
 }
 
+sub set_offset {
+   my ($self, $offset) = @_;
+
+   # todo: base offset on lines or so, not on pixels
+   $self->{children}[1]->set_value ($offset);
+}
+
+sub clear {
+   my ($self) = @_;
+
+   $self->{par} = [];
+   $self->{height} = 0;
+   $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
+}
+
 sub add_paragraph {
    my ($self, $color, $text, $indent) = @_;
 
-   #TODO: intelligently "reformat" paragraph
-
    for my $line (split /\n/, $text) {
-      my $height = $self->text_height ($line);
-      $self->{height} += $height;
-      push @{$self->{par}}, [$height, $color, $indent, $line];
+      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 {
@@ -2287,28 +2449,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 ($_->[3], $_->[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]->update;
+         $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 {
+      $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
          glClearColor 0.5, 0.5, 0.5, 0;
          glClear GL_COLOR_BUFFER_BIT;
 
          my $top = int $self->{children}[1]{range}[0];
 
          my $y0 = $top;
-         my $y1 = $top + $self->{h};
+         my $y1 = $top + $H;
 
          my $y = 0;
 
@@ -2317,19 +2493,20 @@
          $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_width ($self->{w} - $par->[2]);
-               $layout->set_markup ($par->[3]);
+               $layout->set_foreground (@{ $par->[2] });
+               $layout->set_width ($W - $par->[3]);
+               $layout->set_markup ($par->[4]);
 
                my ($w, $h, $data, $format, $internalformat) = $layout->render;
 
-               glRasterPos $par->[2], $y - $y0;
+               glRasterPos $par->[3], $y - $y0;
                glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
             }
 
@@ -2406,33 +2583,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;
 }
 
 #############################################################################
@@ -2474,9 +2636,29 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $w, $h, $changed) = @_;
+
+   return unless $changed;
 
-   $self->SUPER::size_allocate ($w - 4, $h - 4);
+   $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
+}
+
+sub visibility_change {
+   my ($self, $visible) = @_;
+
+   return unless $visible;
+
+   $self->{root}->on_post_alloc ("move_$self" => sub {
+      my $widget = $self->{owner}
+         or return;
+
+      my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
+
+      ($x, $y) = $widget->coord2global (-$self->{w}, 0)
+         if $x + $self->{w} > $::WIDTH;
+
+      $self->move_abs ($x, $y);
+   });
 }
 
 sub _draw {
@@ -2503,6 +2685,7 @@
    glEnd;
    
    glTranslate 2 - 0.375, 2 - 0.375;
+
    $self->SUPER::_draw;
 }
 
@@ -2518,7 +2701,8 @@
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      aspect => 1,
+      aspect     => 1,
+      can_events => 0,
       @_,
    );
 
@@ -2543,10 +2727,18 @@
    (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
+   return unless $::CONN;
 
    my $face;
 
@@ -2579,116 +2771,6 @@
 
 #############################################################################
 
-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 ". pack "N", $item->{tag}) }],
-               ["apply",   sub { $::CONN->send ("apply $item->{tag}") }],
-               (
-                  $item->{flags} & Crossfire::Protocol::F_LOCKED
-                  ? (
-                     ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
-                    )
-                  : (
-                     ["lock",   sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
-                     ["drop",   sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
-                  )
-               ),
-            );
-
-            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 {
-   my ($self) = @_;
-
-   my $desc = _item_to_desc ($self->{item});
-
-   $self->{name_lbl}->set_text ($desc);
-}
-
-#############################################################################
-
 package CFClient::UI::Inventory;
 
 our @ISA = CFClient::UI::ScrolledWindow::;
@@ -2697,7 +2779,7 @@
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      scrolled => (new CFClient::UI::VBox),
+      scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
       @_,
    );
 
@@ -2717,19 +2799,16 @@
 
    $self->{real_items} = \@items;
 
+   my $row = 0;
    for my $item (@items) {
-      $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
-      $item->update_item ();
-   }
-
-   $self->{scrolled}->add (@items);
+      CFClient::Item::update_widgets $item;
 
-#   $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
-}
+      $self->{scrolled}->add (0, $row, $item->{face_widget});
+      $self->{scrolled}->add (1, $row, $item->{desc_widget});
+      $self->{scrolled}->add (2, $row, $item->{weight_widget});
 
-sub size_request {
-   my ($self) = @_;
-   ($self->{req_w}, $self->{req_h});
+      $row++;
+   }
 }
 
 #############################################################################
@@ -2774,7 +2853,7 @@
 sub popup {
    my ($self, $ev) = @_;
 
-   $self->emit ("popdown");
+   $self->_emit ("popdown");
 
    # maybe save $GRAB? must be careful about events...
    $GRAB = $self;
@@ -2799,7 +2878,7 @@
       undef $GRAB;
       $self->hide;
 
-      $self->emit ("popdown");
+      $self->_emit ("popdown");
       $self->{hover}[1]->() if $self->{hover};
    }
 }
@@ -2872,6 +2951,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};
@@ -2923,9 +3004,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 {
@@ -2935,10 +3021,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};
 }
 
@@ -2948,26 +3036,31 @@
    ($self->{w}, $self->{h})
 }
 
-sub size_allocate {
-   my ($self, $w, $h) = @_;
+sub _to_pixel {
+   my ($coord, $size, $max) = @_;
 
-   my $old_w = $self->{old_w}; $self->{old_w} = $w;
-   my $old_h = $self->{old_h}; $self->{old_h} = $h;
+   $coord =
+      $coord eq "center" ? ($max - $size) * 0.5
+    : $coord eq "max"    ? $max
+    :                      $coord;
 
-   CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
-      if $old_w && $old_h && ($old_w != $w || $old_h != $h);
+   $coord = 0            if $coord < 0;
+   $coord = $max - $size if $coord > $max - $size;
+
+   int $coord + 0.5
+}
+
+sub size_allocate {
+   my ($self, $w, $h, $changed) = @_;
 
    for my $child ($self->children) {
       my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
 
-      $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
-         if exists $child->{req_x};
-
-      $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
-         if exists $child->{req_y};
+      $X = $child->{force_x} if exists $child->{force_x};
+      $Y = $child->{force_y} if exists $child->{force_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;
+      $X = _to_pixel $X, $W, $self->{w};
+      $Y = _to_pixel $Y, $H, $self->{h};
 
       $child->configure ($X, $Y, $W, $H);
    }
@@ -2988,24 +3081,33 @@
 sub update {
    my ($self) = @_;
 
-   $self->check_size;
    $::WANT_REFRESH++;
 }
 
 sub add {
    my ($self, @children) = @_;
 
-   for my $child (@children) {
-      $child->{toplevel} = 1;
-
-      # integerise window positions
-      $child->{x} = int $child->{x};
-      $child->{y} = int $child->{y};
-   }
+   $_->{is_toplevel} = 1
+      for @children;
 
    $self->SUPER::add (@children);
 }
 
+sub remove {
+   my ($self, @children) = @_;
+
+   $self->SUPER::remove (@children);
+
+   delete $self->{is_toplevel}
+      for @children;
+
+   while (@children) {
+      my $w = pop @children;
+      push @children, $w->children;
+      $w->set_invisible;
+   }
+}
+
 sub on_refresh {
    my ($self, $id, $cb) = @_;
 
@@ -3026,48 +3128,62 @@
          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->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#
-            
-            $widget->{req_w} = $w;
-            $widget->{req_h} = $h;
+         $widget->{visible} or last; # do not resize invisible widgets
 
-            $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
+         my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
+                          ? @$widget{qw(force_w force_h)}
+                          : $widget->size_request;
 
-            $widget->{parent}->check_size
-               if $widget->{parent};
-         }
+         my $min_size = $widget->{is_toplevel} ? 16 : 0;
+
+         $w = $min_size if $w < $min_size;
+         $h = $min_size if $h < $min_size;
+
+         $widget->{req_w} = $w;
+         $widget->{req_h} = $h;
+
+         $self->{size_alloc}{$widget} = [$widget, undef, undef];
+
+         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 = $widget->{w} || $widget->{req_w} unless defined $w;
+         $h = $widget->{h} || $widget->{req_h} unless defined $h;
 
          $w = 0 if $w < 0;
          $h = 0 if $h < 0;
 
+         $w = int $w + 0.5;
+         $h = int $h + 0.5;
+
+         my $changed = $widget->{w} != $w || $widget->{h} != $h;
+
          $widget->{w} = $w;
          $widget->{h} = $h;
-         $widget->size_allocate ($w, $h);
-         $widget->emit (size_allocate => $w, $h);
+
+         $widget->emit (size_allocate => $w, $h, $changed);
       }
    }