--- deliantra/Deliantra-Client/DC/UI.pm	2006/05/24 03:29:20	1.227
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/05/28 02:31:03	1.250
@@ -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}) {
@@ -52,12 +72,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 +96,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 +108,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 +135,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 +160,30 @@
       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 (@widgets) {
-      if ($widget->{toplevel}) {
+   for my $widget (values %WIDGET) {
+      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;
 }
 
 #############################################################################
@@ -189,13 +206,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
 }
 
@@ -208,30 +232,78 @@
 
 sub show {
    my ($self) = @_;
+
    return if $self->{parent};
 
    $CFClient::UI::ROOT->add ($self);
 }
 
-sub show_centered {
+sub center {
    my ($self) = @_;
-   return if $self->{parent};
-
-   $self->show;
 
    $CFClient::UI::ROOT->on_post_alloc (
-      "centered $self" => sub {
-         $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
+      "center_$self" => sub {
+         $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
       },
    );
+
+   $self->update;
 }
 
-sub hide {
+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);
+}
+
+sub set_invisible {
    my ($self) = @_;
 
+   return unless $self->{visible};
+
+   # broken show/hide model
+
+   delete $self->{root};
+   delete $self->{visible};
+
    undef $GRAB  if $GRAB  == $self;
    undef $HOVER if $HOVER == $self;
 
+   CFClient::UI::check_tooltip
+      if $CFClient::UI::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};
 }
@@ -249,8 +321,8 @@
 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;
 }
@@ -282,7 +354,7 @@
    }
 
    if ($self->{w} != $w || $self->{h} != $h) {
-      $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
+      $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h];
    }
 }
 
@@ -310,6 +382,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 +417,7 @@
 
    my $focus = $FOCUS; $FOCUS = $self;
 
-   $self->emit (focus_in => $focus);
+   $self->_emit (focus_in => $focus);
 
    $focus->update if $focus;
    $FOCUS->update;
@@ -353,15 +430,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) = @_;
@@ -405,10 +485,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;
@@ -438,11 +518,9 @@
 
    Scalar::Util::weaken ($self->{parent} = $parent);
 
-   # TODO: req_w _does_change after ->reconfigure
-   $self->check_size
-      unless exists $self->{req_w};
+   $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
 
-   $self->show;
+   $self->check_size;
 }
 
 sub check_size {
@@ -465,12 +543,23 @@
    push @{ $self->{signal_cb}{$signal} }, $cb;
 }
 
-sub emit {
+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 DESTROY {
    my ($self) = @_;
 
@@ -591,7 +680,7 @@
 
    $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
 
-   $self->check_size;
+   $self->check_size (1);
    $self->update;
 }
 
@@ -741,20 +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)};
+   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 ($cw, $ch) = @$self{qw(child_w child_h)};
-#   $w = $self->{w};
-   $self->child->configure (0, 0, $cw, $ch);
+   $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;
 }
 
@@ -815,10 +918,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]);
       },
    ;
 
@@ -835,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) = @_;
+
+   $self->SUPER::size_allocate ($w, $h);
+
+   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
 
@@ -893,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,
       @_
    );
 
@@ -963,9 +1083,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->{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->check_size;
       };
 
@@ -978,7 +1100,10 @@
 
          ($x, $y) = ($ev->{x}, $ev->{y});
 
-         $self->move ($bx + $x - $ox, $by + $y - $oy);
+         $self->{user_x} = $bx + $x - $ox;
+         $self->{user_y} = $by + $y - $oy;
+
+         $self->move ($self->{user_x}, $self->{user_y});
          $self->update;
       };
    }
@@ -1050,24 +1175,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->check_size (1);
 }
 
-# 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) = @_;
 
@@ -1079,6 +1204,7 @@
       $_->hide;
    }
 
+   $self->check_size (1);
    $self->update;
 }
 
@@ -1120,8 +1246,8 @@
 
    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}};
@@ -1185,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 $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;
 
-         my $alloc_h = $h[$_];
-         $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
-         $h[$_] = $alloc_h;
+      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
+
+         $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
@@ -1245,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,
+      @_,
+   )
 }
 
 #############################################################################
@@ -1512,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 {
@@ -1536,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) = @_;
 
@@ -1564,7 +1656,7 @@
    } 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;
    }
@@ -1661,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) {
@@ -1719,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 {
@@ -1787,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});
    }
 }
 
@@ -2090,9 +2183,10 @@
 sub set_range {
    my ($self, $range) = @_;
 
-   $self->{range} = $range;
+   ($range, $self->{range}) = ($self->{range}, $range);
 
-   $self->update;
+   $self->update
+      if "@$range" ne "@{$self->{range}}";
 }
 
 sub set_value {
@@ -2113,7 +2207,7 @@
    @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
 
    if ($value != $old_value) {
-      $self->emit (changed => $value);
+      $self->_emit (changed => $value);
       $self->update;
    }
 }
@@ -2295,7 +2389,7 @@
    $self->reflow;
 }
 
-sub text_height {
+sub text_size {
    my ($self, $text, $indent) = @_;
 
    my $layout = $self->{layout};
@@ -2304,7 +2398,7 @@
    $layout->set_width ($self->{children}[0]{w} - $indent);
    $layout->set_markup ($text);
    
-   ($layout->size)[1]
+   $layout->size
 }
 
 sub reflow {
@@ -2333,9 +2427,9 @@
    my ($self, $color, $text, $indent) = @_;
 
    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]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
@@ -2351,27 +2445,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]->set_range ([$height, 0, $height, $self->{h}, 1]);
+         $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;
 
@@ -2380,19 +2489,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;
             }
 
@@ -2469,33 +2579,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;
 }
 
 #############################################################################
@@ -2581,7 +2676,8 @@
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      aspect => 1,
+      aspect     => 1,
+      can_events => 0,
       @_,
    );
 
@@ -2650,118 +2746,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 - examine\nshift+leftclick - move/pickup/drop\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->{mod} & CFClient::KMOD_SHIFT) && $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} == 1) {
-            $::CONN->send ("examine $item->{tag}");
-         } 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::;
@@ -2770,7 +2754,7 @@
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      scrolled => (new CFClient::UI::Table),
+      scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
       @_,
    );
 
@@ -2790,25 +2774,16 @@
 
    $self->{real_items} = \@items;
 
+   my $row = 0;
    for my $item (@items) {
-      $item->{item} = $item;
-      $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
-      $item->update_item ();
-   }
+      CFClient::Item::update_widgets $item;
 
-   my $i = 0;
-   for (@items) {
-      $self->{scrolled}->add (0, $i, $_);
-      my $nrof = $_->{item}->{nrof} || 1;
-      $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
-   }
-
-#   $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++;
+   }
 }
 
 #############################################################################
@@ -2853,7 +2828,7 @@
 sub popup {
    my ($self, $ev) = @_;
 
-   $self->emit ("popdown");
+   $self->_emit ("popdown");
 
    # maybe save $GRAB? must be careful about events...
    $GRAB = $self;
@@ -2878,7 +2853,7 @@
       undef $GRAB;
       $self->hide;
 
-      $self->emit ("popdown");
+      $self->_emit ("popdown");
       $self->{hover}[1]->() if $self->{hover};
    }
 }
@@ -2951,6 +2926,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};
@@ -3003,6 +2980,7 @@
    my $class = shift;
 
    $class->SUPER::new (
+      visible => 1,
       @_,
    )
 }
@@ -3030,12 +3008,6 @@
 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);
-
    for my $child ($self->children) {
       my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
 
@@ -3045,6 +3017,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;
 
@@ -3075,7 +3049,7 @@
    my ($self, @children) = @_;
 
    for my $child (@children) {
-      $child->{toplevel} = 1;
+      $child->{is_toplevel} = 1;
 
       # integerise window positions
       $child->{x} = int $child->{x};
@@ -3084,11 +3058,11 @@
 
    $self->SUPER::add (@children);
 
-   while (@children) {
-      my $w = pop @children;
-      push @children, $w->children;
-      $w->{visible} = 1;
+   for (my @widgets = @children; my $w = pop @widgets; ) {
+      push @widgets, $w->children;
+      $w->set_visible;
    }
+
 }
 
 sub remove {
@@ -3099,7 +3073,7 @@
    while (@children) {
       my $w = pop @children;
       push @children, $w->children;
-      delete $w->{visible};
+      $w->set_invisible;
    }
 }
 
@@ -3124,19 +3098,22 @@
    }
 
    if ($self->{check_size}) {
-      my @queue = ([], []);
+      my @queue;
 
-      for (;;) {
+      while () {
          if ($self->{check_size}) {
-            # heuristic: check containers last
-            push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
-               for values %{delete $self->{check_size}}
+            #TODO use array-of-depth approach
+
+            @queue = sort { $a->{visible} <=> $b->{visible} }
+                          @queue, values %{delete $self->{check_size}};
          }
 
-         my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
+         my $widget = pop @queue || last;
+
+         defined $widget->{visible} or last; # do not resize invisible widgets
 
-         my ($w, $h) = $widget->{user_w} && $widget->{user_h}
-            ? @$widget{qw(user_w user_h)}
+         my ($w, $h) = $widget->{def_w} && $widget->{def_h}
+            ? @$widget{qw(def_w def_h)}
             : $widget->size_request;
 
          if (delete $widget->{force_alloc}
@@ -3154,16 +3131,18 @@
        }
    }
 
-   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);
       }
    }