--- deliantra/Deliantra-Client/DC/UI.pm	2006/05/03 19:56:05	1.184
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/05/12 15:45:42	1.199
@@ -1,5 +1,6 @@
 package CFClient::UI;
 
+use utf8;
 use strict;
 
 use Scalar::Util ();
@@ -25,8 +26,7 @@
 
                $tip = $tip->($widget) if CODE:: eq ref $tip;
                
-               $TOOLTIP->set_markup ($widget->{tooltip});
-
+               $TOOLTIP->set_tooltip_from ($widget);
                $TOOLTIP->show;
 
                my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
@@ -36,6 +36,8 @@
                }
 
                $TOOLTIP->move ($x, $y);
+               $TOOLTIP->check_size;
+               $TOOLTIP->update;
             }
 
             return;
@@ -234,12 +236,7 @@
    }
 
    if ($self->{w} != $w || $self->{h} != $h) {
-      $self->{w} = $w;
-      $self->{h} = $h;
-
-      $self->size_allocate ($w, $h);
-      $self->update;
-      $self->emit (size_allocate => $w, $h);
+      $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
    }
 }
 
@@ -257,7 +254,8 @@
    $_->reconfigure
       for $self->children;
 
-   $_->check_size;
+   $self->check_size (1);
+   $self->update;
 }
 
 sub set_max_size {
@@ -267,30 +265,18 @@
    delete $self->{max_h}; $self->{max_h} = $h if $h;
 }
 
-# return top left coordinates
-sub _topleft {
-   my ($self, $x, $y) = @_;
-
-   $self->{parent}
-      or Carp::confess "no parent widget in _topleft\n";#d#
-
-   $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
-}
-
 # translate global coordinates to local coordinate system
 sub coord2local {
    my ($self, $x, $y) = @_;
 
-   my ($X, $Y) = $self->_topleft;
-   ($x - $X, $y - $Y)
+   $self->{parent}->coord2local ($x  - $self->{x}, $y - $self->{y})
 }
 
 # translate local coordinates to global coordinate system
 sub coord2global {
    my ($self, $x, $y) = @_;
 
-   my ($X, $Y) = $self->_topleft;
-   ($x + $X, $y + $Y)
+   $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
 }
 
 sub focus_in {
@@ -398,32 +384,17 @@
    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) = @_;
+   my ($self, $forced) = @_;
 
-   $self->{parent}
-      or return 1;
-
-   my ($w, $h) = $self->{user_w} && $self->{user_h}
-      ? @$self{qw(user_w user_h)}
-      : $self->size_request;
-
-   if ($w != $self->{req_w} || $h != $self->{req_h}) {
-      $self->{req_w} = $w;
-      $self->{req_h} = $h;
-
-      $self->{parent}->check_size
-         or $self->size_allocate (
-               (List::Util::max $self->{w}, $w),
-               (List::Util::max $self->{h}, $h),
-            );
-
-      1
-   } else {
-      0
-   }
+   $self->{force_alloc} = 1 if $forced;
+   $CFClient::UI::ROOT->{check_size}{$self} = $self;
 }
 
 sub update {
@@ -530,18 +501,19 @@
 }
 
 sub add {
-   my ($self, $child) = @_;
+   my ($self, @widgets) = @_;
 
-   $child->set_parent ($self);
+   $_->set_parent ($self)
+      for @widgets;
 
    use sort 'stable';
 
    $self->{children} = [
       sort { $a->{z} <=> $b->{z} }
-         @{$self->{children}}, $child
+         @{$self->{children}}, @widgets
    ];
 
-   $child->check_size;
+   $self->check_size (1);
    $self->update;
 }
 
@@ -658,7 +630,7 @@
 sub update {
    my ($self) = @_;
 
-   $ROOT->on_refresh ($self => sub { $self->render_child });
+   $ROOT->on_post_alloc ($self => sub { $self->render_child });
    $self->SUPER::update;
 }
 
@@ -699,15 +671,12 @@
    my $tex = $self->{texture}
       or return;
 
-   glEnable GL_BLEND;
-   glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
    glColor 0, 0, 0, 1;
 
-   $tex->draw_quad (0, 0, $w, $h);
+   $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
 
-   glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
 }
 
@@ -741,11 +710,20 @@
    $self->update;
 }
 
-# hmm, this does not work for topleft of $self... but we should not aks for that
-sub _topleft {
+# hmm, this does not work for topleft of $self... but we should not ask for that
+sub coord2local {
    my ($self, $x, $y) = @_;
 
-   $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
+   $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
+}
+
+sub coord2global {
+   my ($self, $x, $y) = @_;
+
+   $x = List::Util::min $self->{w}, $x - $self->{view_x};
+   $y = List::Util::min $self->{h}, $y - $self->{view_y};
+
+   $self->SUPER::coord2global ($x, $y)
 }
 
 sub find_widget {
@@ -800,7 +778,7 @@
    $self
 }
 
-#TODO# update range on size_allocate depeneing on child
+#TODO# update range on size_allocate depending on child
 # update viewport offset on scroll
 
 #############################################################################
@@ -814,38 +792,33 @@
 sub new {
    my $class = shift;
 
-   my $self = $class->SUPER::new (
-      bg        => [1, 1, 1, 1],
-      border_bg => [1, 1, 1, 1],
-      border    => 0.8,
-      @_
-   );
-
-   $self
+   $class->SUPER::new (
+      bg => undef,
+      @_,
+   )
 }
 
 sub _draw {
    my ($self) = @_;
 
-   my ($w, $h) = ($self->{w}, $self->{h});
+   if ($self->{bg}) {
+      my ($w, $h) = @$self{qw(w h)};
 
-   glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-   glEnable GL_TEXTURE_2D;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+      glEnable GL_BLEND;
+      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+      glColor @{ $self->{bg} };
 
-#   glBegin GL_QUADS;
-#   glColor 0, 0, 0, 0;
-#   glVertex 0 , 0;
-#   glVertex 0 , $h;
-#   glVertex $w, $h;
-#   glVertex $w, 0;
-#   glEnd;
+      glBegin GL_QUADS;
+      glVertex 0 , 0;
+      glVertex 0 , $h;
+      glVertex $w, $h;
+      glVertex $w, 0;
+      glEnd;
 
+      glDisable GL_BLEND;
+   }
 
-   $self->child->draw;
-   glDisable GL_BLEND;
-   glDisable GL_TEXTURE_2D;
+   $self->SUPER::_draw;
 }
 
 #############################################################################
@@ -971,18 +944,16 @@
    my ($w,  $h ) = ($self->{w}, $self->{h});
    my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
 
-   glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
 
    my $border = $self->border;
 
    glColor @{ $self->{border_bg} };
-   $tex[1]->draw_quad (0, 0, $w, $border);
-   $tex[3]->draw_quad (0, $border, $border, $ch);
-   $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
-   $tex[4]->draw_quad (0, $h - $border, $w, $border);
+   $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);
 
    if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
       my $bg = $tex[0];
@@ -996,12 +967,11 @@
       $bg->{s} = $rep_x;
       $bg->{t} = $rep_y;
       $bg->{wrap_mode} = 1;
-      $bg->draw_quad ($border, $border, $cw, $ch);
-
-      glDisable GL_TEXTURE_2D;
-      glDisable GL_BLEND;
+      $bg->draw_quad_alpha ($border, $border, $cw, $ch);
    }
 
+   glDisable GL_TEXTURE_2D;
+
    $self->{title}->draw if $self->{title};
 
    $self->child->draw;
@@ -1237,6 +1207,8 @@
 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;
@@ -1285,12 +1257,13 @@
    my $self = $class->SUPER::new (
       fg         => [1, 1, 1],
       #font      => default_font
+      #text      => initial text
+      #markup    => initial narkup
+      layout     => (new CFClient::Layout),
       fontsize   => 1,
-      text       => "",
       align      => -1,
       valign     => -1,
       padding    => 2,
-      layout     => new CFClient::Layout,
       can_events => 0,
       %arg
    );
@@ -1301,8 +1274,11 @@
       $self->{template} = $layout;
    }
 
-   $self->set_text   (delete $self->{text})   if exists $self->{text};
-   $self->set_markup (delete $self->{markup}) if exists $self->{markup};
+   if (exists $self->{markup}) {
+      $self->set_markup (delete $self->{markup});
+   } else {
+      $self->set_text (delete $self->{text});
+   }
 
    $self
 }
@@ -1324,21 +1300,15 @@
    $self->SUPER::update;
 }
 
-sub reconfigure {
-   my ($self) = @_;
-
-   delete $self->{texture};
-}
-
 sub set_text {
    my ($self, $text) = @_;
 
    return if $self->{text} eq "T$text";
    $self->{text} = "T$text";
 
+   $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
    $self->{layout}->set_text ($text);
 
-   delete $self->{texture};
    $self->update;
    $self->check_size;
 }
@@ -1349,9 +1319,11 @@
    return if $self->{text} eq "M$markup";
    $self->{text} = "M$markup";
 
+   my $rgba = $markup =~ /span.*(?:foreground|background)/;
+
+   $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
    $self->{layout}->set_markup ($markup);
 
-   delete $self->{texture};
    $self->update;
    $self->check_size;
 }
@@ -1392,43 +1364,44 @@
 
    $self->{fontsize} = $fontsize;
    delete $self->{texture};
-   $self->check_size;
+
    $self->update;
+   $self->check_size;
 }
 
 sub _draw {
    my ($self) = @_;
 
    my $tex = $self->{texture} ||= do {
+      $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);
-      new_from_layout CFClient::Texture $self->{layout}
-   };
 
-   glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-   glEnable GL_TEXTURE_2D;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+      my $tex = new_from_layout CFClient::Texture $self->{layout};
 
-   glColor @{$self->{fg}};
+      $self->{ox} = int $self->{align} < 0 ? $self->{padding}
+                      : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
+                      :                      ($self->{w} - $tex->{w}) * 0.5;
 
-   $self->{ox} = int (
-      $self->{align} < 0 ? $self->{padding}
-    : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
-    :                      ($self->{w} - $tex->{w}) * 0.5
-   );
+      $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
+                      : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
+                      :                       ($self->{h} - $tex->{h}) * 0.5;
 
-   $self->{oy} = int (
-      $self->{valign} < 0 ? $self->{padding}
-    : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
-    :                       ($self->{h} - $tex->{h}) * 0.5
-   );
+      $tex
+   };
 
-   $tex->draw_quad ($self->{ox}, $self->{oy});
+   glEnable GL_TEXTURE_2D;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+
+   if ($tex->{format} == GL_ALPHA) {
+      glColor @{$self->{fg}};
+      $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
+   } else {
+      $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
+   }
 
    glDisable GL_TEXTURE_2D;
-   glDisable GL_BLEND;
 }
 
 #############################################################################
@@ -1473,6 +1446,15 @@
    $self->emit (changed => $self->{text});
 }
 
+sub set_text {
+   my ($self, $text) = @_;
+
+   $self->{cursor} = length $text;
+   $self->_set_text ($text);
+   $self->check_size;
+   $self->update;
+}
+
 sub get_text {
    $_[0]{text}
 }
@@ -1491,14 +1473,6 @@
    $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
 }
 
-sub set_text {
-   my ($self, $text) = @_;
-
-   $self->{cursor} = length $text;
-   $self->_set_text ($text);
-   $self->update;
-}
-
 sub key_down {
    my ($self, $ev) = @_;
 
@@ -1694,16 +1668,13 @@
       $self->{fg} = $self->{active_fg};
    }
 
-   glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
    glColor 0, 0, 0, 1;
 
-   $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
+   $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
 
    glDisable GL_TEXTURE_2D;
-   glDisable GL_BLEND;
 
    $self->SUPER::_draw;
 }
@@ -1760,16 +1731,11 @@
 
    glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
 
-   glEnable GL_BLEND;
-   glEnable GL_TEXTURE_2D;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-
    my $tex = $self->{state} ? $tex[1] : $tex[0];
 
-   $tex->draw_quad (0, 0, $s, $s);
-
+   glEnable GL_TEXTURE_2D;
+   $tex->draw_quad_alpha (0, 0, $s, $s);
    glDisable GL_TEXTURE_2D;
-   glDisable GL_BLEND;
 }
 
 #############################################################################
@@ -1822,14 +1788,11 @@
       ($w, $h) = ($h, $w);
    }
 
-   glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
-   $tex->draw_quad (0, 0, $w, $h);
+   $tex->draw_quad_alpha (0, 0, $w, $h);
 
-   glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
 }
 
@@ -2131,18 +2094,15 @@
    my $knob_a = $inner_pad_px + ($value - $page * 0.5);
    my $knob_b = $inner_pad_px + ($value + $page * 0.5);
 
-   glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
    # draw background
-   $tex[1]->draw_quad (0, 0, $w, $h);
+   $tex[1]->draw_quad_alpha (0, 0, $w, $h);
 
    # draw handle
-   $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
+   $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
 
-   glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
 }
 
@@ -2163,7 +2123,7 @@
       #font      => default_font
       @_,
                  
-      layout     => (new CFClient::Layout),
+      layout     => (new CFClient::Layout 1),
       par        => [],
       height     => 0,
       children   => [
@@ -2191,7 +2151,7 @@
 
    $layout->set_height ($self->{fontsize} * $::FONTSIZE);
    $layout->set_width ($self->{children}[0]{w});
-   $layout->set_text ($text);
+   $layout->set_markup ($text);
    
    ($layout->size)[1]
 }
@@ -2239,7 +2199,7 @@
 
    delete $self->{texture};
 
-   $ROOT->on_refresh ($self, sub {
+   $ROOT->on_post_alloc ($self, sub {
       if (delete $self->{need_reflow}) {
          my $height = 0;
 
@@ -2257,8 +2217,6 @@
          glClearColor 0, 0, 0, 0;
          glClear GL_COLOR_BUFFER_BIT;
 
-         glEnable GL_BLEND;
-         glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
          glEnable GL_TEXTURE_2D;
          glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
@@ -2277,18 +2235,17 @@
             my $h = $par->[0];
 
             if ($y0 < $y + $h && $y < $y1) {
-               $layout->set_text ($par->[2]);
+               $layout->set_foreground (@{ $par->[1] });
+               $layout->set_markup ($par->[2]);
 
-               glColor @{ $par->[1] };
                my ($W, $H) = $layout->size;
-               CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
+               CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
             }
 
             $y += $h;
          }
 
          glDisable GL_TEXTURE_2D;
-         glDisable GL_BLEND;
       };
    });
 }
@@ -2296,14 +2253,11 @@
 sub _draw {
    my ($self) = @_;
 
-   glEnable GL_BLEND;
-   glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
    glColor 1, 1, 1, 1;
-   $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
+   $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
    glDisable GL_TEXTURE_2D;
-   glDisable GL_BLEND;
 
    $self->{children}[1]->draw;
 
@@ -2407,19 +2361,21 @@
    )
 }
 
-sub set_markup {
-   my ($self, $text) = @_;
+sub set_tooltip_from {
+   my ($self, $widget) = @_;
 
-   $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
-   $self->{label}->set_markup ($text);
-   $self->add ($self->{label});
+   $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),
+   );
 }
 
 sub size_request {
    my ($self) = @_;
 
-   $self->child->set_max_size ($::WIDTH * 0.3);
-
    my ($w, $h) = @{$self->child}{qw(req_w req_h)};
 
    ($w + 4, $h + 4)
@@ -2434,7 +2390,6 @@
 sub _draw {
    my ($self) = @_;
 
-   glPushMatrix;
    glTranslate 0.375, 0.375;
 
    my ($w, $h) = @$self{qw(w h)};
@@ -2455,9 +2410,7 @@
    glVertex $w, 0;
    glEnd;
    
-   glPopMatrix;
-
-   glTranslate 2, 2;
+   glTranslate 2 - 0.375, 2 - 0.375;
    $self->SUPER::_draw;
 }
 
@@ -2485,23 +2438,130 @@
 sub _draw {
    my ($self) = @_;
 
+   return unless $::CONN;#d# manage and cache textures differently
    my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
 
    # TODO animation
    if ($tex) {
-      glEnable GL_BLEND;
-      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
       glEnable GL_TEXTURE_2D;
       glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
       glColor 1, 1, 1, 1;
-      $tex->draw_quad (0, 0, $self->{w}, $self->{h});
+      $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
       glDisable GL_TEXTURE_2D;
-      glDisable GL_BLEND;
    }
 }
 
 #############################################################################
 
+package CFClient::UI::InventoryItem;
+
+our @ISA = CFClient::UI::HBox::;
+
+sub new {
+   my $class = shift;
+
+   my %args = @_;
+
+   my $item = delete $args{item};
+
+   my $desc = $item->{nrof} < 2
+      ? $item->{name}
+      : "$item->{nrof} $item->{name_pl}";
+
+
+   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) {
+            $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
+         } elsif ($ev->{button} == 2) {
+            $::CONN->send ("apply $item->{tag}");
+         } elsif ($ev->{button} == 3) {
+            CFClient::UI::Menu->new (
+               items => [
+                  ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
+                  [
+                     $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
+                     sub { $::CONN->send ("lock $item->{tag}") },
+                  ],
+                  ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
+                  ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
+                  ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
+               ],
+            )->popup ($ev);
+         }
+
+         1
+      },
+      %args
+   );
+
+   $self->add (new CFClient::UI::Face
+      can_events => 0,
+      face       => $item->{face},
+      anim       => $item->{anim},
+      animspeed  => $item->{animspeed},
+   );
+
+   $self->add (new CFClient::UI::Label
+      can_events => 0,
+      text       => $desc,
+   );
+
+   $self
+}
+
+#############################################################################
+
+package CFClient::UI::Inventory;
+
+our @ISA = CFClient::UI::ScrolledWindow::;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      scrolled => (new CFClient::UI::VBox),
+      @_,
+   );
+
+   $self
+}
+
+sub set_items {
+   my ($self, $items) = @_;
+
+   $self->{scrolled}->clear;
+   return unless $items;
+
+   my @items = sort { $a->{type} <=> $b->{type} } @$items;
+
+   $self->{real_items} = \@items;
+
+   for my $item (@items) {
+      my $desc = $item->{nrof} < 2
+                     ? $item->{name}
+                     : "$item->{nrof} $item->{name_pl}";
+
+      $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
+   }
+
+#   $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
+}
+
+sub size_request {
+   my ($self) = @_;
+   ($self->{req_w}, $self->{req_h});
+}
+
+#############################################################################
+
 package CFClient::UI::Menu;
 
 our @ISA = CFClient::UI::FancyFrame::;
@@ -2574,37 +2634,169 @@
 
 #############################################################################
 
+package CFClient::UI::Statusbox;
+
+our @ISA = CFClient::UI::VBox::;
+
+sub reorder {
+   my ($self) = @_;
+   my $NOW = time;
+
+   while (my ($k, $v) = each %{ $self->{item} }) {
+      delete $self->{item}{$k} if $v->{timeout} < $NOW;
+   }
+
+   my @widgets;
+
+   my @items = sort {
+                  $a->{pri} <=> $b->{pri}
+                     or $b->{id} <=> $a->{id}
+               } values %{ $self->{item} };
+
+   my $count = 10 + 1;
+   for my $item (@items) {
+      last unless --$count;
+
+      push @widgets, $item->{label} ||= do {
+         # TODO: doesn't handle markup well (read as: at all)
+         my $short = $item->{count} > 1
+                     ? "<b>$item->{count} ×</b> $item->{text}"
+                     : $item->{text};
+
+         for ($short) {
+            s/^\s+//;
+            s/\012.*/…/s;
+            my $len = int 40 / $item->{fontsize};
+            substr $_, $len, length, "…" if $len < length;
+         }
+
+         new CFClient::UI::Label
+            markup        => $short,
+            tooltip       => $item->{tooltip},
+            tooltip_font  => $::FONT_PROP,
+            tooltip_width => 0.67,
+            fontsize      => $item->{fontsize},
+            color         => $item->{color},
+            can_events    => 1,
+            can_hover     => 1
+      };
+   }
+
+   $self->clear;
+   $self->SUPER::add (reverse @widgets);
+}
+
+sub add {
+   my ($self, $text, %arg) = @_;
+
+   $text =~ s/^\s+//;
+   $text =~ s/\s+$//;
+
+   my $timeout = time + ((delete $arg{timeout}) || 60);
+
+   my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
+
+   if (my $item = $self->{item}{$group}) {
+      if ($item->{text} eq $text) {
+         $item->{count}++;
+      } else {
+         $item->{count} = 1;
+         $item->{text} = $item->{tooltip} = $text;
+      }
+      $item->{id} = ++$self->{id};
+      $item->{timeout} = $timeout;
+      delete $item->{label};
+   } else {
+      $self->{item}{$group} = {
+         id       => ++$self->{id},
+         text     => $text,
+         timeout  => $timeout,
+         tooltip  => $text,
+         fontsize => 0.8,
+         color    => [0.8, 0.8, 0.8, 0.8],
+         pri      => 0,
+         count    => 1,
+         %arg,
+      };
+   }
+
+   $self->reorder;
+}
+
+#############################################################################
+
 package CFClient::UI::Root;
 
 our @ISA = CFClient::UI::Container::;
 
 use CFClient::OpenGL;
 
+sub new {
+   my $class = shift;
+
+   $class->SUPER::new (
+      @_,
+   )
+}
+
+sub configure {
+   my ($self, $x, $y, $w, $h) = @_;
+
+   $self->{w} = $w;
+   $self->{h} = $h;
+}
+
 sub check_size {
    my ($self) = @_;
 
-   $self->configure (0, 0, $::WIDTH, $::HEIGHT);
+   $self->size_allocate ($self->{w}, $self->{h})
+      if $self->{w};
 }
 
 sub size_request {
-   ($::WIDTH, $::HEIGHT)
+   my ($self) = @_;
+
+   ($self->{w}, $self->{h})
 }
 
-sub configure {
-   my ($self, $x, $y, $w, $h) = @_;
+sub size_allocate {
+   my ($self, $w, $h) = @_;
 
-   $self->SUPER::configure ($x, $y, $w, $h);
+   my $old_w = $self->{old_w};
+   my $old_h = $self->{old_h};
+
+   if ($old_w && $old_h) {
+      for my $child ($self->children) {
+         $child->{x}      = int 0.5 + $child->{x}      * $w / $old_w;
+         $child->{w}      = int 0.5 + $child->{w}      * $w / $old_w;
+         $child->{req_w}  = int 0.5 + $child->{req_w}  * $w / $old_w if exists $child->{req_w};
+         $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
+         $child->{y}      = int 0.5 + $child->{y}      * $h / $old_h;
+         $child->{h}      = int 0.5 + $child->{h}      * $h / $old_h;
+         $child->{req_h}  = int 0.5 + $child->{req_h}  * $h / $old_h if exists $child->{req_h};
+         $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
+      }
+   }
 
-   for my $child (@{$self->{children}}) {
+   for my $child ($self->children) {
       my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
 
       $X = List::Util::max 0, List::Util::min $w - $W, $X;
       $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
-      $child->configure ($X, $Y, $W,$H);
+      $child->configure ($X, $Y, $W, $H);
    }
+
+   $self->{old_w} = $w;
+   $self->{old_h} = $h;
+}
+
+sub coord2local {
+   my ($self, $x, $y) = @_;
+
+   ($x, $y)
 }
 
-sub _topleft {
+sub coord2global {
    my ($self, $x, $y) = @_;
 
    ($x, $y)
@@ -2614,13 +2806,13 @@
    my ($self) = @_;
 
    $self->check_size;
-   ::refresh ();
+   $::WANT_REFRESH++;
 }
 
 sub add {
    my ($self, $child) = @_;
 
-   # integerize window positions
+   # integerise window positions
    $child->{x} = int $child->{x};
    $child->{y} = int $child->{y};
 
@@ -2633,129 +2825,81 @@
    $self->{refresh_hook}{$id} = $cb;
 }
 
-sub draw  {
-   my ($self) = @_;
-
-   while (my $rcb = delete $self->{refresh_hook}) {
-      $_->() for values %$rcb;
-   }
-
-   glViewport 0, 0, $::WIDTH, $::HEIGHT;
-   glClearColor +($::CFG->{fow_intensity}) x 3, 1;
-   glClear GL_COLOR_BUFFER_BIT;
-
-   glMatrixMode GL_PROJECTION;
-   glLoadIdentity;
-   glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
-   glMatrixMode GL_MODELVIEW;
-   glLoadIdentity;
+sub on_post_alloc {
+   my ($self, $id, $cb) = @_;
 
-   $self->_draw;
+   $self->{post_alloc_hook}{$id} = $cb;
 }
 
-#############################################################################
-
-package CFClient::UI::InventoryItem;
-
-our @ISA = CFClient::UI::HBox::;
-
-sub new {
-   my $class = shift;
-
-   my %args = @_;
-
-   my $item = $args{item};
-
-   my $desc = $item->{nrof} < 2
-      ? $item->{name}
-      : "$item->{nrof} $item->{name_pl}";
-
+sub draw {
+   my ($self) = @_;
 
-   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) = @_;
+   while ($self->{refresh_hook}) {
+      $_->()
+         for values %{delete $self->{refresh_hook}};
+   }
 
-         # todo: maybe put examine on 1? but should just be a tooltip :(
-         if ($ev->{button} == 1) {
-            $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
-         } elsif ($ev->{button} == 2) {
-            $::CONN->send ("apply $item->{tag}");
-         } elsif ($ev->{button} == 3) {
-            CFClient::UI::Menu->new (
-               items => [
-                  ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
-                  [
-                     $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
-                     sub { $::CONN->send ("lock $item->{tag}") },
-                  ],
-                  ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
-                  ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
-                  ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
-               ],
-            )->popup ($ev);
+   if ($self->{check_size}) {
+      my @queue = ([], []);
+
+      for (;;) {
+         if ($self->{check_size}) {
+            # heuristic: check containers last
+            push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
+               for values %{delete $self->{check_size}}
          }
 
-         1
-      },
-      %args
-   );
-   $self->add(new CFClient::UI::Face
-      can_events => 0,
-      face       => $item->{face},
-      anim       => $item->{anim},
-      animspeed  => $item->{animspeed});
-   $self->add(new CFClient::UI::Label
-      can_events => 0,
-      text => $desc);
-
-   $self
-}
-
-#############################################################################
-
-package CFClient::UI::Inventory;
-
-our @ISA = CFClient::UI::ScrolledWindow::;
-
-sub new {
-   my $class = shift;
+         my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
 
-   my $self = $class->SUPER::new (
-      scrolled => (new CFClient::UI::VBox),
-      @_,
-   );
+         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;
 
-   $self
-}
-
-sub set_items {
-   my ($self, $items) = @_;
+            $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
 
-   $self->{scrolled}->clear;
-   return unless $items;
+            $widget->{parent}->check_size
+               if $widget->{parent};
+         }
+       }
+   }
 
-   my @items = sort { $a->{type} <=> $b->{type} } @$items;
+   while ($self->{size_alloc}) {
+      for (values %{delete $self->{size_alloc}}) {
+         my ($widget, $w, $h) = @$_;
 
-   $self->{real_items} = \@items;
+         $w = 0 if $w < 0;
+         $h = 0 if $h < 0;
 
-   for my $item (@items) {
-      my $desc = $item->{nrof} < 2
-                     ? $item->{name}
-                     : "$item->{nrof} $item->{name_pl}";
+         $widget->{w} = $w;
+         $widget->{h} = $h;
+         $widget->size_allocate ($w, $h);
+         $widget->emit (size_allocate => $w, $h);
+      }
+   }
 
-      $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
+   while ($self->{post_alloc_hook}) {
+      $_->()
+         for values %{delete $self->{post_alloc_hook}};
    }
 
-#   $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
-}
+   glViewport 0, 0, $::WIDTH, $::HEIGHT;
+   glClearColor +($::CFG->{fow_intensity}) x 3, 1;
+   glClear GL_COLOR_BUFFER_BIT;
 
-sub size_request {
-   my ($self) = @_;
-   ($self->{req_w}, $self->{req_h});
+   glMatrixMode GL_PROJECTION;
+   glLoadIdentity;
+   glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
+   glMatrixMode GL_MODELVIEW;
+   glLoadIdentity;
+
+   $self->_draw;
 }
 
 #############################################################################