--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/25 11:18:49	1.174
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/06/03 22:50:48	1.275
@@ -1,41 +1,63 @@
 package CFClient::UI;
 
+use utf8;
 use strict;
 
 use Scalar::Util ();
 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};
+
+      $win->{show} = $_->{visible} && $_->{is_toplevel};
+   }
+
+   $layout
+}
+
+sub set_layout {
+   my ($layout) = @_;
+
+   $LAYOUT = $layout;
+}
+
 sub check_tooltip {
+   return if $ENV{CFPLUS_DEBUG} & 8;
+
    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};
 
                $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);
-
-               if ($x + $TOOLTIP->{w} > $::WIDTH) {
-                  ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
-               }
-
-               $TOOLTIP->move ($x, $y);
             }
 
             return;
@@ -49,12 +71,12 @@
 
 # class methods for events
 sub feed_sdl_key_down_event { 
-   $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
+   $FOCUS->emit (key_down => $_[0])
       if $FOCUS;
 }
 
 sub feed_sdl_key_up_event {
-   $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
+   $FOCUS->emit (key_up => $_[0])
       if $FOCUS;
 }
 
@@ -73,10 +95,8 @@
 
    $BUTTON_STATE |= 1 << ($ev->{button} - 1);
 
-   if ($GRAB) {
-      ($x, $y) = $GRAB->coord2local ($x, $y);
-      $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
-   }
+   $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
+      if $GRAB;
 }
 
 sub feed_sdl_button_up_event {
@@ -87,10 +107,8 @@
 
    $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
 
-   if ($GRAB) {
-      ($x, $y) = $GRAB->coord2local ($x, $y);
-      $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
-   }
+   $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
+      if $GRAB;
 
    if (!$BUTTON_STATE) {
       my $grab = $GRAB; undef $GRAB;
@@ -116,10 +134,8 @@
       check_tooltip;
    }
 
-   if ($HOVER) {
-      ($x, $y) = $HOVER->coord2local ($x, $y);
-      $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
-   }
+   $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
+      if $HOVER;
 }
 
 # convert position array to integers
@@ -135,6 +151,47 @@
    }
 }
 
+sub full_refresh {
+   # make a copy, otherwise for complains about freed values.
+   my @widgets = values %WIDGET;
+
+   $_->update
+      for @widgets;
+}
+
+sub reconfigure_widgets {
+   # make a copy, otherwise C<for> complains about freed values.
+   my @widgets = values %WIDGET;
+
+   $_->reconfigure
+      for @widgets;
+}
+
+# call when resolution changes etc.
+sub rescale_widgets {
+   my ($sx, $sy) = @_;
+
+   for my $widget (values %WIDGET) {
+      if ($widget->{is_toplevel}) {
+         $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
+         $widget->{y} += int $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};
+
+         $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
+         $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
+
+      }
+   }
+
+   reconfigure_widgets;
+}
+
 #############################################################################
 
 package CFClient::UI::Base;
@@ -147,19 +204,35 @@
    my $class = shift;
 
    my $self = bless {
-      x          => 0,
-      y          => 0,
+      x          => "center",
+      y          => "center",
       z          => 0,
+      w          => undef,
+      h          => undef,
       can_events => 1,
       @_
    }, $class;
 
+   Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
+
    for (keys %$self) {
-      if (/^connect_(.*)$/) {
+      if (/^on_(.*)$/) {
          $self->connect ($1 => delete $self->{$_});
       }
    }
 
+   if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
+      $self->{x}       = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
+      $self->{y}       = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
+      $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
+      $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_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};
+
+      $self->show if $layout->{show};
+   }
+
    $self
 }
 
@@ -178,21 +251,73 @@
    $CFClient::UI::ROOT->add ($self);
 }
 
-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);
+
+   $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;
@@ -201,10 +326,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 {
@@ -216,29 +341,30 @@
    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) {
-      $self->{w} = $w;
-      $self->{h} = $h;
+   if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
+      return unless $self->{visible};
 
-      $self->size_allocate ($w, $h);
-      $self->update;
+      $self->{alloc_w} = $w;
+      $self->{alloc_h} = $h;
+
+      $self->{root}{size_alloc}{$self+0} = $self;
    }
 }
 
@@ -247,16 +373,11 @@
 }
 
 sub children {
+   # nop
 }
 
-# call when resoltuion changes etc.
-sub reconfigure {
-   my ($self) = @_;
-
-   $_->reconfigure
-      for $self->children;
-
-   $_->check_size;
+sub visible_children {
+   $_[0]->children
 }
 
 sub set_max_size {
@@ -266,30 +387,34 @@
    delete $self->{max_h}; $self->{max_h} = $h if $h;
 }
 
-# return top left coordinates
-sub _topleft {
-   my ($self, $x, $y) = @_;
+sub set_tooltip {
+   my ($self, $tooltip) = @_;
+
+   $tooltip =~ s/^\s+//;
+   $tooltip =~ s/\s+$//;
 
-   $self->{parent}
-      or Carp::confess "no parent widget in _topleft\n";#d#
+   return if $self->{tooltip} eq $tooltip;
 
-   $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
+   $self->{tooltip} = $tooltip;
+
+   if ($CFClient::UI::TOOLTIP->{owner} == $self) {
+      delete $CFClient::UI::TOOLTIP->{owner};
+      CFClient::UI::check_tooltip;
+   }
 }
 
 # 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 {
@@ -300,7 +425,7 @@
 
    my $focus = $FOCUS; $FOCUS = $self;
 
-   $self->emit (focus_in => $focus);
+   $self->_emit (focus_in => $focus);
 
    $focus->update if $focus;
    $FOCUS->update;
@@ -313,72 +438,25 @@
 
    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 mouse_motion { 0 }
+sub button_up    { 0 }
+sub key_down     { 0 }
+sub key_up       { 0 }
 
 sub button_down {
    my ($self, $ev, $x, $y) = @_;
 
    $self->focus_in;
-}
-
-sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
-sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
-sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
-sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
-sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
-
-sub draw {
-   my ($self) = @_;
-
-   return unless $self->{h} && $self->{w};
-
-   glPushMatrix;
-   glTranslate $self->{x}, $self->{y}, 0;
-   $self->_draw;
-   glPopMatrix;
-
-   if ($self == $HOVER && $self->{can_hover}) {
-      my ($x, $y) = @$self{qw(x y)};
-
-      glColor 1, 0.8, 0.5, 0.2;
-      glEnable GL_BLEND;
-      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-      glBegin GL_QUADS;
-      glVertex $x             , $y;
-      glVertex $x + $self->{w}, $y;
-      glVertex $x + $self->{w}, $y + $self->{h};
-      glVertex $x             , $y + $self->{h};
-      glEnd;
-      glDisable GL_BLEND;
-   }
 
-   if ($ENV{PCLIENT_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};
-      glEnd;
-      glPopMatrix;
-      CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
-   }
-}
-
-sub _draw {
-   my ($self) = @_;
-
-   warn "no draw defined for $self\n";
+   0
 }
 
 sub find_widget {
@@ -397,31 +475,43 @@
    my ($self, $parent) = @_;
 
    Scalar::Util::weaken ($self->{parent} = $parent);
+   $self->set_visible if $parent->{visible};
 }
 
-sub check_size {
-   my ($self) = @_;
+sub connect {
+   my ($self, $signal, $cb) = @_;
 
-   $self->{parent}
-      or return 1;
+   push @{ $self->{signal_cb}{$signal} }, $cb;
+}
 
-   my ($w, $h) = $self->{user_w} && $self->{user_h}
-      ? @$self{qw(user_w user_h)}
-      : $self->size_request;
+sub _emit {
+   my ($self, $signal, @args) = @_;
 
-   if ($w != $self->{req_w} || $h != $self->{req_h}) {
-      $self->{req_w} = $w;
-      $self->{req_h} = $h;
+   List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
+}
 
-      $self->{parent}->check_size
-         or $self->size_allocate (
-               (List::Util::max $self->{w}, $w),
-               (List::Util::max $self->{h}, $h),
-            );
+sub emit {
+   my ($self, $signal, @args) = @_;
 
-      1
+   $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+0};
+
+      $self->{root}{realloc}{$self+0} = $self;
+      $self->{root}->update;
    } else {
-      0
+      delete $self->{req_w};
+      delete $self->{req_h};
    }
 }
 
@@ -432,21 +522,77 @@
       if $self->{parent};
 }
 
-sub connect {
-   my ($self, $signal, $cb) = @_;
+sub reconfigure {
+   my ($self) = @_;
 
-   push @{ $self->{signal_cb}{$signal} }, $cb;
+   $self->realloc;
+   $self->update;
 }
 
-sub emit {
-   my ($self, $signal, @args) = @_;
+# using global variables seems a bit hacky, but passing through all drawing
+# functions seems pointless.
+our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
 
-   List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
+sub draw {
+   my ($self) = @_;
+
+   return unless $self->{h} && $self->{w};
+
+   # update screen rectangle
+   local $draw_x = $draw_x + $self->{x};
+   local $draw_y = $draw_y + $self->{y};
+   local $draw_w = $draw_x + $self->{w};
+   local $draw_h = $draw_y + $self->{h};
+
+   # skip widgets that are entirely outside the drawing area
+   return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
+          || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
+
+   glPushMatrix;
+   glTranslate $self->{x}, $self->{y}, 0;
+   $self->_draw;
+   glPopMatrix;
+
+   if ($self == $HOVER && $self->{can_hover}) {
+      my ($x, $y) = @$self{qw(x y)};
+
+      glColor 1, 0.8, 0.5, 0.2;
+      glEnable GL_BLEND;
+      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+      glBegin GL_QUADS;
+      glVertex $x             , $y;
+      glVertex $x + $self->{w}, $y;
+      glVertex $x + $self->{w}, $y + $self->{h};
+      glVertex $x             , $y + $self->{h};
+      glEnd;
+      glDisable GL_BLEND;
+   }
+
+   if ($ENV{CFPLUS_DEBUG} & 1) {
+      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} - 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;
+   }
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   warn "no draw defined for $self\n";
 }
 
 sub DESTROY {
    my ($self) = @_;
 
+   delete $WIDGET{$self+0};
    #$self->deactivate;
 }
 
@@ -465,8 +611,8 @@
    # range [value, low, high, page]
 
    $class->SUPER::new (
-      bg        => [0, 0, 0, 0.2],
-      active_bg => [1, 1, 1, 0.5],
+      #bg        => [0, 0, 0, 0.2],
+      #active_bg => [1, 1, 1, 0.5],
       @_
    )
 }
@@ -474,20 +620,26 @@
 sub _draw {
    my ($self) = @_;
 
-   my ($w, $h) = @$self{qw(w h)};
+   my $color = $FOCUS == $self && $self->{active_bg}
+             ? $self->{active_bg}
+             : $self->{bg};
 
-   glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-   glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
+   if ($color && (@$color < 4 || $color->[3])) {
+      my ($w, $h) = @$self{qw(w h)};
 
-   glBegin GL_QUADS;
-   glVertex 0 , 0;
-   glVertex 0 , $h;
-   glVertex $w, $h;
-   glVertex $w, 0;
-   glEnd;
+      glEnable GL_BLEND;
+      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+      glColor @$color;
 
-   glDisable GL_BLEND;
+      glBegin GL_QUADS;
+      glVertex 0 , 0;
+      glVertex 0 , $h;
+      glVertex $w, $h;
+      glVertex $w, 0;
+      glEnd;
+
+      glDisable GL_BLEND;
+   }
 }
 
 #############################################################################
@@ -502,7 +654,9 @@
 }
 
 sub size_request {
-   (0, 0)
+   my ($self) = @_;
+
+   ($self->{w} + 0, $self->{h} + 0)
 }
 
 sub draw { }
@@ -516,31 +670,34 @@
 sub new {
    my ($class, %arg) = @_;
 
-   my $children = delete $arg{children} || [];
+   my $children = delete $arg{children};
 
    my $self = $class->SUPER::new (
       children   => [],
       can_events => 0,
       %arg,
    );
-   $self->add ($_) for @$children;
+
+   $self->add (@$children)
+      if $children;
 
    $self
 }
 
 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->realloc;
 }
 
 sub children {
@@ -555,8 +712,7 @@
 
    $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
 
-   $self->check_size;
-   $self->update;
+   $self->realloc;
 }
 
 sub clear {
@@ -569,6 +725,8 @@
       delete $_->{parent};
       $_->hide;
    }
+
+   $self->realloc;
 }
 
 sub find_widget {
@@ -579,7 +737,7 @@
 
    my $res;
 
-   for (reverse @{ $self->{children} }) {
+   for (reverse $self->visible_children) {
       $res = $_->find_widget ($x, $y)
          and return $res;
    }
@@ -638,6 +796,8 @@
 
 #############################################################################
 
+# back-buffered drawing area
+
 package CFClient::UI::Window;
 
 our @ISA = CFClient::UI::Bin::;
@@ -653,7 +813,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;
 }
 
@@ -664,33 +824,44 @@
    $self->update;
 }
 
+sub _render {
+   my ($self) = @_;
+
+   $self->{children}[0]->draw;
+}
+
 sub render_child {
    my ($self) = @_;
 
    $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
       glClearColor 0, 0, 0, 0;
       glClear GL_COLOR_BUFFER_BIT;
-      $self->child->draw;
+
+      {
+         package CFClient::UI::Base;
+
+         ($draw_x, $draw_y, $draw_w, $draw_h) =
+            (0, 0, $self->{w}, $self->{h});
+      }
+
+      $self->_render;
    };
 }
 
 sub _draw {
    my ($self) = @_;
 
-   my ($w, $h) = ($self->w, $self->h);
+   my ($w, $h) = @$self{qw(w h)};
 
    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;
+   glColor 1, 1, 1, 1;
 
-   $tex->draw_quad (0, 0, $w, $h);
+   $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
 
-   glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
 }
 
@@ -700,23 +871,147 @@
 
 our @ISA = CFClient::UI::Window::;
 
-sub new { die }
+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->size_allocate (0, 0, @$self{qw(child_w child_h)});
+   my ($w, $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 _draw {
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   my $child = $self->child;
+
+   $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
+   $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
+
+   $self->child->configure (0, 0, $w, $h);
+   $self->update;
+}
+
+sub set_offset {
+   my ($self, $x, $y) = @_;
+
+   $self->{view_x} = int $x;
+   $self->{view_y} = int $y;
+
+   $self->update;
+}
+
+# hmm, this does not work for topleft of $self... but we should not ask for that
+sub coord2local {
+   my ($self, $x, $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 {
+   my ($self, $x, $y) = @_;
+
+   if (   $x >= $self->{x} && $x < $self->{x} + $self->{w}
+       && $y >= $self->{y} && $y < $self->{y} + $self->{h}
+   ) {
+       $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
+   } else {
+      $self->CFClient::UI::Base::find_widget ($x, $y)
+   }
+}
+
+sub _render {
    my ($self) = @_;
 
-   $self->{children}[1]->draw;
+   local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
+   local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
+
+   CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
+
+   $self->SUPER::_render;
+}
+
+#############################################################################
+
+package CFClient::UI::ScrolledWindow;
+
+our @ISA = CFClient::UI::HBox::;
+
+sub new {
+   my ($class, %arg) = @_;
+
+   my $child = delete $arg{child};
+
+   my $self;
+
+   my $slider = new CFClient::UI::Slider
+      vertical   => 1,
+      range      => [0, 0, 1, 0.01], # HACK fix
+      on_changed => sub {
+         $self->{vp}->set_offset (0, $_[1]);
+      },
+   ;
+
+   $self = $class->SUPER::new (
+      vp     => (new CFClient::UI::ViewPort expand => 1),
+      slider => $slider,
+      %arg,
+   );
+
+   $self->SUPER::add ($self->{vp}, $self->{slider});
+   $self->add ($child) if $child;
+
+   $self
+}
+
+sub add {
+   my ($self, $widget) = @_;
+
+   $self->{vp}->add ($self->{child} = $widget);
+}
+
+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
 
 #############################################################################
 
@@ -729,38 +1024,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;
 }
 
 #############################################################################
@@ -771,32 +1061,46 @@
 
 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;
+   my ($class, %arg) = @_;
 
-   # TODO: user_x, user_y, overwrite moveto?
+   my $title = delete $arg{title};
 
    my $self = $class->SUPER::new (
-      bg         => [1, 1, 1, 1],
-      border_bg  => [1, 1, 1, 1],
-      border     => 0.8,
-      can_events => 1,
-      @_
+      bg          => [1, 1, 1, 1],
+      border_bg   => [1, 1, 1, 1],
+      border      => 0.6,
+      can_events  => 1,
+      min_w       => 16,
+      min_h       => 16,
+      %arg,
    );
 
-   $self->{title} &&= new CFClient::UI::Label
+   $self->{title} = new CFClient::UI::Label
       align    => 0,
       valign   => 1,
-      text     => $self->{title},
-      fontsize => 1;
+      text     => $title,
+      fontsize => $self->{border}
+         if defined $title;
 
    $self
 }
 
+sub add {
+   my ($self, @widgets) = @_;
+
+   $self->SUPER::add (@widgets);
+   $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
+}
+
 sub border {
    int $_[0]{border} * $::FONTSIZE
 }
@@ -804,6 +1108,9 @@
 sub size_request {
    my ($self) = @_;
 
+   $self->{title}->size_request
+      if $self->{title};
+
    my ($w, $h) = $self->SUPER::size_request;
 
    (
@@ -815,39 +1122,51 @@
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
-   $h -= List::Util::max 0, $self->border * 2;
-   $w -= List::Util::max 0, $self->border * 2;
+   if ($self->{title}) {
+      $self->{title}{w} = $w;
+      $self->{title}{h} = $h;
+      $self->{title}->size_allocate ($w, $h);
+   }
 
-   $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
-      if $self->{title};
+   my $border = $self->border;
 
-   $self->child->configure ($self->border, $self->border, $w, $h);
+   $h -= List::Util::max 0, $border * 2;
+   $w -= List::Util::max 0, $border * 2;
+   
+   $self->child->configure ($border, $border, $w, $h);
 }
 
 sub button_down {
    my ($self, $ev, $x, $y) = @_;
 
+   my ($w, $h) = @$self{qw(w h)};
    my $border = $self->border;
 
-   if ($x < $self->{w} && $x >= $self->{w} - $border
-       && $y < $self->{h} && $y >= $self->{h} - $border) {
+   my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
+   my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
 
+   if ($lr & $td) {
+      my ($wx, $wy) = ($self->{x}, $self->{y});
       my ($ox, $oy) = ($ev->{x}, $ev->{y});
       my ($bw, $bh) = ($self->{w}, $self->{h});
 
+      my $mx = $x < $border;
+      my $my = $y < $border;
+
       $self->{motion} = sub {
          my ($ev, $x, $y) = @_;
 
-         ($x, $y) = ($ev->{x}, $ev->{y});
+         my $dx = $ev->{x} - $ox;
+         my $dy = $ev->{y} - $oy;
 
-         $self->{user_w} = $bw + $x - $ox;
-         $self->{user_h} = $bh + $y - $oy;
-         $self->check_size;
-      };
+         $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
+         $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
 
-   } elsif ($x >= 0 && $x < $self->{w}
-            && $y >= 0 && $y < $border) {
+         $self->realloc;
+         $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
+      };
 
+   } elsif ($lr ^ $td) {
       my ($ox, $oy) = ($ev->{x}, $ev->{y});
       my ($bx, $by) = ($self->{x}, $self->{y});
 
@@ -856,61 +1175,66 @@
 
          ($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);
       };
+   } else {
+      return 0;
    }
+
+   1
 }
 
 sub button_up {
    my ($self, $ev, $x, $y) = @_;
 
-   delete $self->{motion};
+   !!delete $self->{motion}
 }
 
 sub mouse_motion {
    my ($self, $ev, $x, $y) = @_;
 
    $self->{motion}->($ev, $x, $y) if $self->{motion};
+
+   !!$self->{motion}
 }
 
 sub _draw {
    my ($self) = @_;
 
+   my $child = $self->{children}[0];
+
    my ($w,  $h ) = ($self->{w}, $self->{h});
-   my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
+   my ($cw, $ch) = ($child->{w}, $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);
-
-   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;
-   $bg->draw_quad ($border, $border, $cw, $ch);
+   $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]) {
+      glColor @{ $self->{bg} };
+
+      # 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);
+   }
 
    glDisable GL_TEXTURE_2D;
-   glDisable GL_BLEND;
 
-   $self->{title}->draw if $self->{title};
-   $self->child->draw;
+   $child->draw;
+
+   if ($self->{title}) {
+      glTranslate 0, $border - $self->{h};
+      $self->{title}->_draw;
+   }
 }
 
 #############################################################################
@@ -928,24 +1252,24 @@
 
    $class->SUPER::new (
       col_expand => [],
-      @_
+      @_,
    )
 }
 
+sub children {
+   grep $_, map @$_, grep $_, @{ $_[0]{children} }
+}
+
 sub add {
    my ($self, $x, $y, $child) = @_;
 
    $child->set_parent ($self);
    $self->{children}[$y][$x] = $child;
 
-   $child->check_size;
-}
-
-sub children {
-   grep $_, map @$_, grep $_, @{ $_[0]{children} }
+   $self->realloc;
 }
 
-# TODO: move to container class maybe? send childs a signal on removal?
+# TODO: move to container class maybe? send children a signal on removal?
 sub clear {
    my ($self) = @_;
 
@@ -957,7 +1281,7 @@
       $_->hide;
    }
 
-   $self->update;
+   $self->realloc;
 }
 
 sub get_wh {
@@ -998,8 +1322,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}};
@@ -1063,59 +1387,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;
 
-   my $req_h = List::Util::sum @h;
-
-   if ($req_h > $h) {
-      # ah well, not enough space
-      $_ *= $h / $req_h for @h;
+   if ($self->{homogeneous}) {
+      @req = ($space / (@$children || 1)) x @$children;
    } else {
-      my $exp = List::Util::sum map $_->{expand}, @$children;
-      $exp ||= 1;
-      
-      for (0 .. $#$children) {
-         my $child = $children->[$_];
+      @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
+      my $req = List::Util::sum @req;
 
-         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
@@ -1123,65 +1447,39 @@
 
 #############################################################################
 
-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) = @_;
-
-   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;
-      }
-   }
+package CFClient::UI::VBox;
 
-   CFClient::UI::harmonize \@h;
+our @ISA = CFClient::UI::Box::;
 
-   my $y = 0;
-   for (0 .. $#$children) {
-      my $child = $children->[$_];
-      my $h = $h[$_];
-      $child->configure (0, $y, $w, $h);
-
-      $y += $h;
-   }
+sub new {
+   my $class = shift;
 
-   1
+   $class->SUPER::new (
+      vertical => 1,
+      @_,
+   )
 }
 
 #############################################################################
 
 package CFClient::UI::Label;
 
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFClient::UI::DrawBG::;
 
 use CFClient::OpenGL;
 
@@ -1190,13 +1488,19 @@
 
    my $self = $class->SUPER::new (
       fg         => [1, 1, 1],
+      #bg        => none
+      #active_bg => none
       #font      => default_font
+      #text      => initial text
+      #markup    => initial narkup
+      #max_w     => maximum pixel width
+      ellipsise  => 3, # end
+      layout     => (new CFClient::Layout),
       fontsize   => 1,
-      text       => "",
       align      => -1,
       valign     => -1,
-      padding    => 2,
-      layout     => new CFClient::Layout,
+      padding_x  => 2,
+      padding_y  => 2,
       can_events => 0,
       %arg
    );
@@ -1207,20 +1511,23 @@
       $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
 }
 
-sub escape {
-   local $_ = $_[1];
+sub escape($) {
+   local $_ = $_[0];
 
    s/&/&amp;/g;
    s/>/&gt;/g;
    s/</&lt;/g;
 
-   $_[1]
+   $_
 }
 
 sub update {
@@ -1230,23 +1537,17 @@
    $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->realloc;
    $self->update;
-   $self->check_size;
 }
 
 sub set_markup {
@@ -1255,11 +1556,13 @@
    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->realloc;
    $self->update;
-   $self->check_size;
 }
 
 sub size_request {
@@ -1267,6 +1570,8 @@
 
    $self->{layout}->set_font ($self->{font}) if $self->{font};
    $self->{layout}->set_width ($self->{max_w} || -1);
+   $self->{layout}->set_ellipsise ($self->{ellipsise});
+   $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
    $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
 
    my ($w, $h) = $self->{layout}->size;
@@ -1281,16 +1586,16 @@
       $h = List::Util::max $h, $h2;
    }
 
-   (
-      $w + $self->{padding} * 2,
-      $h + $self->{padding} * 2,
-   )
+   ($w, $h)
 }
 
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
-   delete $self->{texture};
+   delete $self->{ox};
+
+   delete $self->{texture}
+      unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
 }
 
 sub set_fontsize {
@@ -1298,43 +1603,47 @@
 
    $self->{fontsize} = $fontsize;
    delete $self->{texture};
-   $self->check_size;
-   $self->update;
+
+   $self->realloc;
 }
 
 sub _draw {
    my ($self) = @_;
 
+   $self->SUPER::_draw; # draw background, if applicable
+
    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);
+      $self->{layout}->set_ellipsise ($self->{ellipsise});
+      $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
+      $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
+
       new_from_layout CFClient::Texture $self->{layout}
    };
 
-   glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+   unless (exists $self->{ox}) {
+      $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
+                       : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
+                       :                      ($self->{w} - $tex->{w}) * 0.5);
+
+      $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
+                       : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
+                       :                       ($self->{h} - $tex->{h}) * 0.5);
+   };
+
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
-   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->{oy} = int (
-      $self->{valign} < 0 ? $self->{padding}
-    : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
-    :                       ($self->{h} - $tex->{h}) * 0.5
-   );
-
-   $tex->draw_quad ($self->{ox}, $self->{oy});
+   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;
 }
 
 #############################################################################
@@ -1357,6 +1666,7 @@
       can_focus  => 1,
       valign     => 0,
       can_events => 1,
+      #text      => ...
       @_
    )
 }
@@ -1376,7 +1686,16 @@
    $text =~ s/./*/g if $self->{hidden};
    $self->{layout}->set_text ("$text ");
 
-   $self->emit (changed => $self->{text});
+   $self->_emit (changed => $self->{text});
+}
+
+sub set_text {
+   my ($self, $text) = @_;
+
+   $self->{cursor} = length $text;
+   $self->_set_text ($text);
+
+   $self->realloc;
 }
 
 sub get_text {
@@ -1391,20 +1710,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 set_text {
-   my ($self, $text) = @_;
-
-   $self->{cursor} = length $text;
-   $self->_set_text ($text);
-   $self->update;
-}
-
 sub key_down {
    my ($self, $ev) = @_;
 
@@ -1414,9 +1719,9 @@
 
    my $text = $self->get_text;
 
-   if ($sym == 8) {
+   if ($uni == 8) {
       substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
-   } elsif ($sym == 127) {
+   } elsif ($uni == 127) {
       substr $text, $self->{cursor}, 1, "";
    } elsif ($sym == CFClient::SDLK_LEFT) {
       --$self->{cursor} if $self->{cursor};
@@ -1426,14 +1731,19 @@
       $self->{cursor} = 0;
    } elsif ($sym == CFClient::SDLK_END) {
       $self->{cursor} = length $text;
-   } elsif ($sym == 27) {
-      $self->emit ('escape');
+   } elsif ($uni == 27) {
+      $self->_emit ('escape');
    } elsif ($uni) {
       substr $text, $self->{cursor}++, 0, chr $uni;
+   } else {
+      return 0;
    }
 
    $self->_set_text ($text);
-   $self->update;
+
+   $self->realloc;
+
+   1
 }
 
 sub focus_in {
@@ -1458,11 +1768,15 @@
 
    $self->_set_text ($self->{text});
    $self->update;
+   
+   1
 }
 
 sub mouse_motion {
    my ($self, $ev, $x, $y) = @_;
 #   printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
+
+   0
 }
 
 sub _draw {
@@ -1523,7 +1837,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) {
@@ -1549,9 +1863,10 @@
       }
 
    } else {
-      $self->SUPER::key_down ($ev);
+      return $self->SUPER::key_down ($ev)
    }
 
+   1
 }
 
 #############################################################################
@@ -1570,9 +1885,9 @@
    my $class = shift;
 
    $class->SUPER::new (
-      padding    => 4,
+      padding_x  => 4,
+      padding_y  => 4,
       fg         => [1, 1, 1],
-      bg         => [1, 1, 1, 0.2],
       active_fg  => [0, 0, 1],
       can_hover  => 1,
       align      => 0,
@@ -1582,13 +1897,16 @@
    )
 }
 
+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};
+
+   1
 }
 
 sub _draw {
@@ -1600,16 +1918,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;
 }
@@ -1630,9 +1945,12 @@
    my $class = shift;
 
    $class->SUPER::new (
-      padding   => 2,
+      padding_x => 2,
+      padding_y => 2,
       fg        => [1, 1, 1],
       active_fg => [1, 1, 0],
+      bg        => [0, 0, 0, 0.2],
+      active_bg => [1, 1, 1, 0.5],
       state     => 0,
       can_hover => 1,
       @_
@@ -1642,17 +1960,21 @@
 sub size_request {
    my ($self) = @_;
 
-   ($self->{padding} * 2 + 6) x 2
+   (6) x 2
 }
 
 sub button_down {
    my ($self, $ev, $x, $y) = @_;
 
-   if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
-       && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
+   if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
+       && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
       $self->{state} = !$self->{state};
-      $self->emit (changed => $self->{state});
+      $self->_emit (changed => $self->{state});
+   } else {
+      return 0
    }
+
+   1
 }
 
 sub _draw {
@@ -1660,22 +1982,19 @@
 
    $self->SUPER::_draw;
 
-   glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
+   glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
 
-   my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
+   my ($w, $h) = @$self{qw(w h)};
 
-   glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
+   my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
 
-   glEnable GL_BLEND;
-   glEnable GL_TEXTURE_2D;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+   glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
 
    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;
 }
 
 #############################################################################
@@ -1728,14 +2047,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;
 }
 
@@ -1934,7 +2250,7 @@
 sub new {
    my $class = shift;
 
-   # range [value, low, high, page]
+   # range [value, low, high, page, unit]
 
    # TODO: 0-width page
    # TODO: req_w/h are wrong with vertical
@@ -1942,116 +2258,186 @@
    my $self = $class->SUPER::new (
       fg        => [1, 1, 1],
       active_fg => [0, 0, 0],
-      range     => [0, 0, 100, 10],
-      req_w     => 20,
-      req_h     => 20,
+      bg        => [0, 0, 0, 0.2],
+      active_bg => [1, 1, 1, 0.5],
+      range     => [0, 0, 100, 10, 0],
+      min_w     => $::WIDTH / 80,
+      min_h     => $::WIDTH / 80,
       vertical  => 0,
       can_hover => 1,
-      inner_pad => 5,
+      inner_pad => 0.02,
       @_
    );
 
+   $self->set_value ($self->{range}[0]);
+   $self->update;
+
    $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) = @_;
+
+   my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
+
+   $hi = $lo + 1 if $hi <= $lo;
+
+   $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;
+
+   @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
+
+   if ($value != $old_value) {
+      $self->_emit (changed => $value);
+      $self->update;
+   }
+}
+
 sub size_request {
    my ($self) = @_;
 
-   my $w = $self->{req_w};
-   my $h = $self->{req_h};
-
-   $self->{vertical} ? ($h, $w) : ($w, $h)
+   ($self->{req_w}, $self->{req_h})
 }
 
 sub button_down {
    my ($self, $ev, $x, $y) = @_;
 
    $self->SUPER::button_down ($ev, $x, $y);
-   $self->mouse_motion ($ev, $x, $y);
+
+   $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
+   
+   $self->mouse_motion ($ev, $x, $y)
 }
 
 sub mouse_motion {
    my ($self, $ev, $x, $y) = @_;
 
    if ($GRAB == $self) {
-      my ($value, $lo, $hi, $page) = @{$self->{range}};
-
       my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
 
-      my $inner_pad_px = $self->_calc_inner_pad_px ($w);
-      my $inner_w = $w - $inner_pad_px * 2;               # * 2 for left & right
+      my (undef, $lo, $hi, $page) = @{$self->{range}};
 
-      $x -= $inner_pad_px;  # substract the padding
-      $x = $x * ($hi - $lo) / $inner_w + $lo;
-      $x = $lo         if $x < $lo;
-      $x = $hi - $page if $x > $hi - $page;
-      $self->{range}[0] = $x;
+      $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
 
-      $self->emit (changed => $x);
-      $self->update;
+      $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
+   } else {
+      return 0;
    }
+
+   1
 }
 
-# the inner_* stuff is for generating a padding for the slider handle,
-# so that the handle doesn't leave the texture. This calculation isn't 100%
-# correct propably, but it does the job for now
-sub _calc_inner_pad_px {
-   my ($self, $w) = @_;
-   ($w / 100) * $self->{inner_pad} # % to pixels
+sub update {
+   my ($self) = @_;
+
+   delete $self->{knob_w};
+   $self->SUPER::update;
 }
 
 sub _draw {
    my ($self) = @_;
 
+   unless ($self->{knob_w}) {
+      $self->set_value ($self->{range}[0]);
+
+      my ($value, $lo, $hi, $page) = @{$self->{range}};
+      my $range = ($hi - $page - $lo) || 1e-100;
+
+      my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
+
+      $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
+      $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
+
+      $value = ($value - $lo) / $range;
+      $value = $value * $self->{scale} + $self->{offset};
+
+      $self->{knob_x} = $value - $knob_w * 0.5;
+      $self->{knob_w} = $knob_w;
+   }
+
    $self->SUPER::_draw ();
 
-   my ($w, $h) = @$self{qw(w h)};
+   glScale $self->{w}, $self->{h};
 
    if ($self->{vertical}) {
       # draw a vertical slider like a rotated horizontal slider
  
+      glTranslate 1, 0, 0;
       glRotate 90, 0, 0, 1;
-      glTranslate 0, -$self->{w}, 0;
-
-      ($w, $h) = ($h, $w);
    }
 
    my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
    my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
 
-   my ($value, $lo, $hi, $page) = @{$self->{range}};
+   glEnable GL_TEXTURE_2D;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+
+   # draw background
+   $tex[1]->draw_quad_alpha (0, 0, 1, 1);
 
-   $hi = $value + 1 if $lo == $hi;
+   # draw handle
+   $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
 
-   my $inner_pad_px = $self->_calc_inner_pad_px ($w);
-   my $inner_w = $w - $inner_pad_px * 2;               # * 2 for left & right
+   glDisable GL_TEXTURE_2D;
+}
 
-   $page  = int $page * $inner_w / ($hi - $lo);
-   $value = int +($value - $lo) * $inner_w / ($hi - $lo);
+#############################################################################
 
-   $w -= $page;
-   $page &= ~1;
-   glTranslate $page * 0.5, 0, 0;
-   $page ||= 2;
+package CFClient::UI::ValSlider;
 
-   my $knob_a = $inner_pad_px + ($value - $page * 0.5);
-   my $knob_b = $inner_pad_px + ($value + $page * 0.5);
+our @ISA = CFClient::UI::HBox::;
 
-   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;
+sub new {
+   my ($class, %arg) = @_;
 
-   # draw background
-   $tex[1]->draw_quad (0, 0, $w, $h);
+   my $range = delete $arg{range};
 
-   # draw handle
-   $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
+   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,
+   );
 
-   glDisable GL_BLEND;
-   glDisable GL_TEXTURE_2D;
+   $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;
@@ -2069,7 +2455,7 @@
       #font      => default_font
       @_,
                  
-      layout     => (new CFClient::Layout),
+      layout     => (new CFClient::Layout 1),
       par        => [],
       height     => 0,
       children   => [
@@ -2078,9 +2464,7 @@
       ],
    );
 
-   $self->{children}[1]->connect (changed => sub {
-      $self->update;
-   });
+   $self->{children}[1]->connect (changed => sub { $self->update });
 
    $self
 }
@@ -2092,16 +2476,28 @@
    $self->reflow;
 }
 
-sub text_height {
-   my ($self, $text) = @_;
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->SUPER::size_allocate ($w, $h);
+
+   $self->{layout}->set_font ($self->{font}) if $self->{font};
+   $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
+   $self->{layout}->set_width ($self->{children}[0]{w});
+
+   $self->reflow;
+}
+
+sub text_size {
+   my ($self, $text, $indent) = @_;
 
    my $layout = $self->{layout};
 
    $layout->set_height ($self->{fontsize} * $::FONTSIZE);
-   $layout->set_width ($self->{w});
-   $layout->set_text ($text);
+   $layout->set_width ($self->{children}[0]{w} - $indent);
+   $layout->set_markup ($text);
    
-   ($layout->size)[1]
+   $layout->size
 }
 
 sub reflow {
@@ -2111,31 +2507,31 @@
    $self->update;
 }
 
-sub size_allocate {
-   my ($self, $w, $h) = @_;
+sub set_offset {
+   my ($self, $offset) = @_;
 
-   $self->SUPER::size_allocate ($w, $h);
+   # todo: base offset on lines or so, not on pixels
+   $self->{children}[1]->set_value ($offset);
+}
 
-   $self->{layout}->set_font ($self->{font}) if $self->{font};
-   $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
-   $self->{layout}->set_width ($self->{children}[0]{w});
+sub clear {
+   my ($self) = @_;
 
-   $self->reflow;
+   $self->{par} = [];
+   $self->{height} = 0;
+   $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
 }
 
 sub add_paragraph {
-   my ($self, $color, $text) = @_;
-
-   #TODO: intelligently "reformat" paragraph
-
-   my $height = $self->text_height ($text);
+   my ($self, $color, $text, $indent) = @_;
 
-   $self->{height} += $height;
-
-   push @{$self->{par}}, [$height, $color, $text];
+   for my $line (split /\n/, $text) {
+      my ($w, $h) = $self->text_size ($line);
+      $self->{height} += $h;
+      push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
+   }
 
-   $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
-   $self->{children}[1]->update;
+   $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
 }
 
 sub update {
@@ -2147,33 +2543,43 @@
 
    delete $self->{texture};
 
-   $ROOT->on_refresh ($self, sub {
+   $ROOT->on_post_alloc ($self, sub {
+      my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
+
       if (delete $self->{need_reflow}) {
          my $height = 0;
 
-         $height += $_->[0] = $self->text_height ($_->[2])
-            for @{$self->{par}};
+         my $layout = $self->{layout};
+
+         $layout->set_height ($self->{fontsize} * $::FONTSIZE);
+
+         for (@{$self->{par}}) {
+            if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
+               $layout->set_width ($W - $_->[3]);
+               $layout->set_markup ($_->[4]);
+               my ($w, $h) = $layout->size;
+               $_->[0] = $w + $_->[3];
+               $_->[1] = $h;
+            }
+
+            $height += $_->[1];
+         }
 
          $self->{height} = $height;
 
-         $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
+         $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
          
          delete $self->{texture};
       }
 
-      $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
-         glClearColor 0, 0, 0, 1;
+      $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
+         glClearColor 0.5, 0.5, 0.5, 0;
          glClear GL_COLOR_BUFFER_BIT;
 
-         glEnable GL_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 $top = int $self->{children}[1]{range}[0];
 
          my $y0 = $top;
-         my $y1 = $top + $self->{h};
+         my $y1 = $top + $H;
 
          my $y = 0;
 
@@ -2181,21 +2587,27 @@
 
          $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_text ($par->[2]);
+               $layout->set_foreground (@{ $par->[2] });
+               $layout->set_width ($W - $par->[3]);
+               $layout->set_markup ($par->[4]);
+
+               my ($w, $h, $data, $format, $internalformat) = $layout->render;
 
-               glColor @{ $par->[1] };
-               my ($W, $H) = $layout->size;
-               CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
+               glRasterPos $par->[3], $y - $y0;
+               glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
             }
 
             $y += $h;
          }
 
-         glDisable GL_TEXTURE_2D;
          glDisable GL_BLEND;
       };
    });
@@ -2204,13 +2616,11 @@
 sub _draw {
    my ($self) = @_;
 
-   if ($self->{texture}) {
-      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->{w}, $self->{h});
-      glDisable GL_TEXTURE_2D;
-   }
+   glEnable GL_TEXTURE_2D;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+   glColor 1, 1, 1, 1;
+   $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
+   glDisable GL_TEXTURE_2D;
 
    $self->{children}[1]->draw;
 
@@ -2268,33 +2678,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;
 }
 
 #############################################################################
@@ -2314,19 +2709,31 @@
    )
 }
 
-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});
+   my $tooltip = $widget->{tooltip};
+
+   if ($ENV{CFPLUS_DEBUG} & 2) {
+      $tooltip .= "\n\n" . (ref $widget) . "\n"
+                . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
+                . "req $widget->{req_w} $widget->{req_h}\n"
+                . "visible $widget->{visible}";
+   }
+
+   $self->add (new CFClient::UI::Label
+      markup    => $tooltip,
+      max_w     => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
+      fontsize  => 0.8,
+      fg        => [0, 0, 0, 1],
+      ellipsise => 0,
+      font      => ($widget->{tooltip_font} || $::FONT_PROP),
+   );
 }
 
 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)
@@ -2338,10 +2745,27 @@
    $self->SUPER::size_allocate ($w - 4, $h - 4);
 }
 
+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 {
    my ($self) = @_;
 
-   glPushMatrix;
    glTranslate 0.375, 0.375;
 
    my ($w, $h) = @$self{qw(w h)};
@@ -2362,9 +2786,8 @@
    glVertex $w, 0;
    glEnd;
    
-   glPopMatrix;
+   glTranslate 2 - 0.375, 2 - 0.375;
 
-   glTranslate 2, 2;
    $self->SUPER::_draw;
 }
 
@@ -2379,33 +2802,674 @@
 sub new {
    my $class = shift;
 
-   $class->SUPER::new (
-      aspect => 1,
+   my $self = $class->SUPER::new (
+      aspect     => 1,
+      can_events => 0,
       @_,
-   )
+   );
+
+   if ($self->{anim} && $self->{animspeed}) {
+      Scalar::Util::weaken (my $widget = $self);
+
+      $self->{timer} = Event->timer (
+         at       => $self->{animspeed} * int $::NOW / $self->{animspeed},
+         hard     => 1,
+         interval => $self->{animspeed},
+         cb       => sub {
+            ++$widget->{frame};
+            $widget->update;
+         },
+      );
+   }
+   
+   $self
 }
 
 sub size_request {
    (32, 8)
 }
 
-sub draw {
+sub update {
    my ($self) = @_;
 
-   my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
+   return unless $self->{visible};
+
+   $self->SUPER::update;
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   return unless $::CONN;
+
+   my $face;
+
+   if ($self->{frame}) {
+      my $anim = $::CONN->{anim}[$self->{anim}];
+
+      $face = $anim->[ $self->{frame} % @$anim ]
+         if $anim && @$anim;
+   }
+   
+   my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
 
    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;
    }
 }
 
+sub DESTROY {
+   my ($self) = @_;
+
+   $self->{timer}->cancel
+      if $self->{timer};
+
+   $self->SUPER::DESTROY;
+}
+
+#############################################################################
+
+package CFClient::UI::Buttonbar;
+
+our @ISA = CFClient::UI::HBox::;
+
+# TODO: should actualyl wrap buttons and other goodies.
+
+#############################################################################
+
+package CFClient::UI::Menu;
+
+our @ISA = CFClient::UI::FancyFrame::;
+
+use CFClient::OpenGL;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      items => [],
+      z     => 100,
+      @_,
+   );
+
+   $self->add ($self->{vbox} = new CFClient::UI::VBox);
+
+   for my $item (@{ $self->{items} }) {
+      my ($widget, $cb) = @$item;
+
+      # handle various types of items, only text for now
+      if (!ref $widget) {
+         $widget = new CFClient::UI::Label
+            can_hover  => 1,
+            can_events => 1,
+            text       => $widget;
+      }
+
+      $self->{item}{$widget} = $item;
+
+      $self->{vbox}->add ($widget);
+   }
+
+   $self
+}
+
+# popup given the event (must be a mouse button down event currently)
+sub popup {
+   my ($self, $ev) = @_;
+
+   $self->_emit ("popdown");
+
+   # maybe save $GRAB? must be careful about events...
+   $GRAB = $self;
+   $self->{button} = $ev->{button};
+
+   $self->show;
+   $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
+}
+
+sub mouse_motion {
+   my ($self, $ev, $x, $y) = @_;
+
+   # TODO: should use vbox->find_widget or so
+   $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
+   $self->{hover} = $self->{item}{$HOVER};
+
+   0
+}
+
+sub button_up {
+   my ($self, $ev, $x, $y) = @_;
+
+   if ($ev->{button} == $self->{button}) {
+      undef $GRAB;
+      $self->hide;
+
+      $self->_emit ("popdown");
+      $self->{hover}[1]->() if $self->{hover};
+   } else {
+      return 0
+   }
+
+   1
+}
+
+#############################################################################
+
+package CFClient::UI::Multiplexer;
+
+our @ISA = CFClient::UI::Container::;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      @_,
+   );
+
+   $self->{current} = $self->{children}[0]
+      if @{ $self->{children} };
+
+   $self
+}
+
+sub add {
+   my ($self, @widgets) = @_;
+
+   $self->SUPER::add (@widgets);
+
+   $self->{current} = $self->{children}[0]
+      if @{ $self->{children} };
+}
+
+sub set_current_page {
+   my ($self, $page_or_widget) = @_;
+
+   my $widget = ref $page_or_widget
+                   ? $page_or_widget
+                   : $self->{children}[$page_or_widget];
+
+   $self->{current} = $widget;
+   $self->{current}->configure (0, 0, $self->{w}, $self->{h});
+
+   $self->_emit (page_changed => $self->{current});
+
+   $self->realloc;
+}
+
+sub visible_children {
+   $_[0]{current}
+}
+
+sub size_request {
+   my ($self) = @_;
+
+   $self->{current}->size_request
+}
+
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->{current}->configure (0, 0, $w, $h);
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   $self->{current}->draw;
+}
+
+#############################################################################
+
+package CFClient::UI::Notebook;
+
+our @ISA = CFClient::UI::VBox::;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      buttonbar   => (new CFClient::UI::Buttonbar),
+      multiplexer => (new CFClient::UI::Multiplexer expand => 1),
+      # filter => # will be put between multiplexer and $self
+      @_,
+   );
+   
+   $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
+   $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
+
+   $self
+}
+
+sub add {
+   my ($self, $title, $widget, $tooltip) = @_;
+
+   Scalar::Util::weaken $self;
+
+   $self->{buttonbar}->add (new CFClient::UI::Button
+      markup      => $title,
+      tooltip     => $tooltip,
+      on_activate => sub { $self->set_current_page ($widget) },
+   );
+
+   $self->{multiplexer}->add ($widget);
+}
+
+sub set_current_page {
+   my ($self, $page) = @_;
+
+   $self->{multiplexer}->set_current_page ($page);
+   $self->_emit (page_changed => $self->{multiplexer}{current});
+}
+
+#############################################################################
+
+package CFClient::UI::Statusbox;
+
+our @ISA = CFClient::UI::VBox::;
+
+sub new {
+   my $class = shift;
+
+   $class->SUPER::new (
+      fontsize => 0.8,
+      @_,
+   )
+}
+
+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/\s+/ /g;
+         }
+
+         new CFClient::UI::Label
+            markup        => $short,
+            tooltip       => $item->{tooltip},
+            tooltip_font  => $::FONT_PROP,
+            tooltip_width => 0.67,
+            fontsize      => $item->{fontsize} || $self->{fontsize},
+            max_w         => $::WIDTH * 0.44,
+            fg            => $item->{fg},
+            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+$//;
+
+   return unless $text;
+
+   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,
+         fg       => [0.8, 0.8, 0.8, 0.8],
+         pri      => 0,
+         count    => 1,
+         %arg,
+      };
+   }
+
+   $self->reorder;
+}
+
+sub reconfigure {
+   my ($self) = @_;
+
+   delete $_->{label}
+      for values %{ $self->{item} || {} };
+
+   $self->reorder;
+   $self->SUPER::reconfigure;
+}
+
+#############################################################################
+
+package CFClient::UI::Inventory;
+
+our @ISA = CFClient::UI::ScrolledWindow::;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
+      @_,
+   );
+
+   $self
+}
+
+sub set_items {
+   my ($self, $items) = @_;
+
+   $self->{child}->clear;
+   return unless $items;
+
+   my @items = sort {
+      ($a->{type} <=> $b->{type})
+         or ($a->{name} cmp $b->{name})
+   } @$items;
+
+   $self->{real_items} = \@items;
+
+   my $row = 0;
+   for my $item (@items) {
+      CFClient::Item::update_widgets $item;
+
+      $self->{child}->add (0, $row, $item->{face_widget});
+      $self->{child}->add (1, $row, $item->{desc_widget});
+      $self->{child}->add (2, $row, $item->{weight_widget});
+
+      $row++;
+   }
+}
+
+#############################################################################
+
+package CFClient::UI::BindEditor;
+
+our @ISA = CFClient::UI::FancyFrame::;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (binding => [], commands => [], @_);
+
+   $self->add (my $vb = new CFClient::UI::VBox);
+
+
+   $vb->add ($self->{rec_btn} = new CFClient::UI::Button
+      text => "start recording",
+      tooltip => "Start/Stops recording of actions."
+                ."All subsequent actions after the recording started will be captured."
+                ."The actions are displayed after the record was stopped."
+                ."To bind the action you have to click on the 'Bind' button",
+      on_activate => sub {
+         unless ($self->{recording}) {
+            $self->start;
+         } else {
+            $self->stop;
+         }
+      });
+
+   $vb->add (new CFClient::UI::Label text => "Actions:");
+   $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
+
+   $vb->add (new CFClient::UI::Label text => "Bound to: ");
+   $vb->add (my $hb = new CFClient::UI::HBox);
+   $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
+   $hb->add (new CFClient::UI::Button
+      text => "bind",
+      tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
+      on_activate => sub {
+         $self->ask_for_bind;
+      });
+
+   $vb->add (my $hb = new CFClient::UI::HBox);
+   $hb->add (new CFClient::UI::Button
+      text => "ok",
+      expand => 1,
+      tooltip => "This closes the binding editor and saves the binding",
+      on_activate => sub {
+         $self->hide;
+         $self->commit;
+      });
+
+   $hb->add (new CFClient::UI::Button
+      text => "cancel",
+      expand => 1,
+      tooltip => "This closes the binding editor without saving",
+      on_activate => sub {
+         $self->hide;
+         $self->{binding_cancel}->()
+            if $self->{binding_cancel};
+      });
+
+   $self->update_binding_widgets;
+
+   $self
+}
+
+sub commit {
+   my ($self) = @_;
+   my ($mod, $sym, $cmds) = $self->get_binding;
+   if ($sym != 0 && @$cmds > 0) {
+      $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
+                        ."'. Don't forget 'Save Config'!");
+      $self->{binding_change}->($mod, $sym, $cmds)
+         if $self->{binding_change};
+   } else {
+      $::STATUSBOX->add ("No action bound, no key or action specified!");
+      $self->{binding_cancel}->()
+         if $self->{binding_cancel};
+   }
+}
+
+sub start {
+   my ($self) = @_;
+
+   $self->{rec_btn}->set_text ("stop recording");
+   $self->{recording} = 1;
+   $self->clear_command_list;
+   $::CONN->start_record if $::CONN;
+}
+
+sub stop {
+   my ($self) = @_;
+
+   $self->{rec_btn}->set_text ("start recording");
+   $self->{recording} = 0;
+
+   my $rec;
+   $rec = $::CONN->stop_record if $::CONN;
+   return unless ref $rec eq 'ARRAY';
+   $self->set_command_list ($rec);
+}
+
+
+sub ask_for_bind_and_commit {
+   my ($self) = @_;
+   $self->ask_for_bind (1);
+}
+
+sub ask_for_bind {
+   my ($self, $commit) = @_;
+
+   CFClient::Binder::open_binding_dialog (sub {
+      my ($mod, $sym) = @_;
+      $self->{binding} = [$mod, $sym];  # XXX: how to stop that memleak?
+      $self->update_binding_widgets;
+      $self->commit if $commit;
+   });
+}
+
+# $mod and $sym are the modifiers and key symbol
+# $cmds is a array ref of strings (the commands)
+# $cb is the callback that is executed on OK
+# $ccb is the callback that is executed on CANCEL and 
+# when the binding was unsuccessful on OK
+sub set_binding {
+   my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
+
+   $self->clear_command_list;
+   $self->{recording} = 0;
+   $self->{rec_btn}->set_text ("start recording");
+
+   $self->{binding} = [$mod, $sym];
+   $self->{commands} = $cmds;
+
+   $self->{binding_change} = $cb;
+   $self->{binding_cancel} = $ccb;
+
+   $self->update_binding_widgets;
+}
+
+# this is a shortcut method that asks for a binding
+# and then just binds it.
+sub do_quick_binding {
+   my ($self, $cmds) = @_;
+   $self->set_binding (undef, undef, $cmds, sub {
+      $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
+   });
+   $self->ask_for_bind (1);
+}
+
+sub update_binding_widgets {
+   my ($self) = @_;
+   my ($mod, $sym, $cmds) = $self->get_binding;
+   $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
+   $self->set_command_list ($cmds);
+}
+
+sub get_binding {
+   my ($self) = @_;
+   return (
+      $self->{binding}->[0],
+      $self->{binding}->[1],
+      [ grep { defined $_ } @{$self->{commands}} ]
+   );
+}
+
+sub clear_command_list {
+   my ($self) = @_;
+   $self->{cmdbox}->clear ();
+}
+
+sub set_command_list {
+   my ($self, $cmds) = @_;
+
+   $self->{cmdbox}->clear ();
+   $self->{commands} = $cmds;
+
+   my $idx = 0;
+
+   for (@$cmds) {
+      $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
+
+      my $i = $idx;
+      $hb->add (new CFClient::UI::Label text => $_);
+      $hb->add (new CFClient::UI::Button
+         text => "delete",
+         tooltip => "Deletes the action from the record",
+         on_activate => sub {
+            $self->{cmdbox}->remove ($hb);
+            $cmds->[$i] = undef;
+         });
+
+
+      $idx++
+   }
+}
+
+#############################################################################
+
+package CFClient::UI::SpellList;
+
+our @ISA = CFClient::UI::Table::;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      binding  => [],
+      commands => [],
+      @_,
+   )
+}
+
+# XXX: Do sorting? Argl...
+sub add_spell {
+   my ($self, $spell) = @_;
+   $self->{spells}->{$spell->{name}} = $spell;
+
+   $self->add (0, $self->{tbl_idx},   new CFClient::UI::Face
+      face => $spell->{face},
+      can_hover => 1,
+      can_events => 1,
+      tooltip => $spell->{message});
+
+   $self->add (1, $self->{tbl_idx},   new CFClient::UI::Label
+      text => $spell->{name},
+      can_hover => 1,
+      can_events => 1,
+      tooltip => $spell->{message},
+      expand => 1);
+
+   $self->add (2, $self->{tbl_idx},   new CFClient::UI::Label
+      text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
+                 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
+      expand => 1);
+
+   $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
+      text => "bind to key",
+      on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
+}
+
+sub rebuild_spell_list {
+   my ($self) = @_;
+   $self->{tbl_idx} = 0;
+   $self->add_spell ($_) for values %{$self->{spells}};
+}
+
+sub remove_spell {
+   my ($self, $spell) = @_;
+   delete $self->{spells}->{$spell->{name}};
+   $self->rebuild_spell_list;
+}
+
 #############################################################################
 
 package CFClient::UI::Root;
@@ -2414,31 +3478,62 @@
 
 use CFClient::OpenGL;
 
-sub check_size {
-   my ($self) = @_;
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      visible => 1,
+      @_,
+   );
 
-   $self->configure (0, 0, $::WIDTH, $::HEIGHT);
+   Scalar::Util::weaken ($self->{root} = $self);
+
+   $self
 }
 
 sub size_request {
-   ($::WIDTH, $::HEIGHT)
+   my ($self) = @_;
+
+   ($self->{w}, $self->{h})
 }
 
-sub configure {
-   my ($self, $x, $y, $w, $h) = @_;
+sub _to_pixel {
+   my ($coord, $size, $max) = @_;
 
-   $self->SUPER::configure ($x, $y, $w, $h);
+   $coord =
+      $coord eq "center" ? ($max - $size) * 0.5
+    : $coord eq "max"    ? $max
+    :                      $coord;
 
-   for my $child (@{$self->{children}}) {
+   $coord = 0            if $coord < 0;
+   $coord = $max - $size if $coord > $max - $size;
+
+   int $coord + 0.5
+}
+
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   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);
+      $X = $child->{force_x} if exists $child->{force_x};
+      $Y = $child->{force_y} if exists $child->{force_y};
+
+      $X = _to_pixel $X, $W, $self->{w};
+      $Y = _to_pixel $Y, $H, $self->{h};
+
+      $child->configure ($X, $Y, $W, $H);
    }
 }
 
-sub _topleft {
+sub coord2local {
+   my ($self, $x, $y) = @_;
+
+   ($x, $y)
+}
+
+sub coord2global {
    my ($self, $x, $y) = @_;
 
    ($x, $y)
@@ -2447,18 +3542,31 @@
 sub update {
    my ($self) = @_;
 
-   $self->check_size;
-   ::refresh ();
+   $::WANT_REFRESH++;
 }
 
 sub add {
-   my ($self, $child) = @_;
+   my ($self, @children) = @_;
 
-   # integerize window positions
-   $child->{x} = int $child->{x};
-   $child->{y} = int $child->{y};
+   $_->{is_toplevel} = 1
+      for @children;
 
-   $self->SUPER::add ($child);
+   $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 {
@@ -2467,23 +3575,126 @@
    $self->{refresh_hook}{$id} = $cb;
 }
 
-sub draw  {
+sub on_post_alloc {
+   my ($self, $id, $cb) = @_;
+
+   $self->{post_alloc_hook}{$id} = $cb;
+}
+
+sub draw {
    my ($self) = @_;
 
-   while (my $rcb = delete $self->{refresh_hook}) {
-      $_->() for values %$rcb;
+   while ($self->{refresh_hook}) {
+      $_->()
+         for values %{delete $self->{refresh_hook}};
    }
 
+   if ($self->{realloc}) {
+      my %queue;
+      my @queue;
+      my $widget;
+
+      outer:
+      while () {
+         if (my $realloc = delete $self->{realloc}) {
+            for $widget (values %$realloc) {
+               $widget->{visible} or next; # do not resize invisible widgets
+
+               $queue{$widget+0}++ and next; # duplicates are common
+
+               push @{ $queue[$widget->{visible}] }, $widget;
+            }
+         }
+
+         while () {
+            @queue or last outer;
+
+            $widget = pop @{ $queue[-1] || [] }
+               and last;
+            
+            pop @queue;
+         }
+
+         delete $queue{$widget+0};
+
+         my ($w, $h) = $widget->size_request;
+
+         $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
+         $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
+
+         $w = $widget->{force_w} if exists $widget->{force_w};
+         $h = $widget->{force_h} if exists $widget->{force_h};
+
+         if ($widget->{req_w} != $w || $widget->{req_h} != $h
+             || delete $widget->{force_realloc}) {
+            $widget->{req_w} = $w;
+            $widget->{req_h} = $h;
+
+            $self->{size_alloc}{$widget+0} = $widget;
+
+            if (my $parent = $widget->{parent}) {
+               $self->{realloc}{$parent+0} = $parent
+                  unless $queue{$parent+0};
+
+               $parent->{force_size_alloc} = 1;
+               $self->{size_alloc}{$parent+0} = $parent;
+            }
+         }
+
+         delete $self->{realloc}{$widget+0};
+       }
+   }
+
+   while (my $size_alloc = delete $self->{size_alloc}) {
+      my @queue = sort { $b->{visible} <=> $a->{visible} }
+                       values %$size_alloc;
+
+      while () {
+         my $widget = pop @queue || last;
+
+         my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
+
+         $w = 0 if $w < 0;
+         $h = 0 if $h < 0;
+
+         $w = int $w + 0.5;
+         $h = int $h + 0.5;
+
+         if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
+            $widget->{old_w} = $widget->{w};
+            $widget->{old_h} = $widget->{h};
+
+            $widget->{w} = $w;
+            $widget->{h} = $h;
+
+            $widget->emit (size_allocate => $w, $h);
+         }
+      }
+   }
+
+   while ($self->{post_alloc_hook}) {
+      $_->()
+         for values %{delete $self->{post_alloc_hook}};
+   }
+
+
    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;
+   glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
    glMatrixMode GL_MODELVIEW;
    glLoadIdentity;
 
+   {
+      package CFClient::UI::Base;
+
+      ($draw_x, $draw_y, $draw_w, $draw_h) =
+         (0, 0, $self->{w}, $self->{h});
+   }
+
    $self->_draw;
 }
 
@@ -2492,7 +3703,7 @@
 package CFClient::UI;
 
 $ROOT = new CFClient::UI::Root;
-$TOOLTIP = new CFClient::UI::Tooltip;
+$TOOLTIP = new CFClient::UI::Tooltip z => 900;
 
 1