--- deliantra/Deliantra-Client/DC/UI.pm	2006/06/12 13:26:14	1.302
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/07/12 17:20:04	1.324
@@ -283,8 +283,7 @@
    $CFClient::UI::TOOLTIP_WATCHER->cb->()
       if $TOOLTIP->{owner} == $self;
 
-   $self->focus_out;
-
+   $self->emit ("focus_out");
    $self->emit (visibility_change => 0);
 }
 
@@ -338,6 +337,10 @@
    Carp::confess "size_request is abstract";
 }
 
+sub baseline_shift {
+   0
+}
+
 sub configure {
    my ($self, $x, $y, $w, $h) = @_;
 
@@ -369,10 +372,6 @@
    }
 }
 
-sub size_allocate {
-   # nothing to be done
-}
-
 sub children {
    # nop
 }
@@ -420,46 +419,67 @@
    $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
 }
 
-sub focus_in {
+sub invoke_focus_in {
    my ($self) = @_;
 
    return if $FOCUS == $self;
    return unless $self->{can_focus};
 
-   my $focus = $FOCUS; $FOCUS = $self;
+   $FOCUS = $self;
 
-   $self->_emit (focus_in => $focus);
+   $self->update;
 
-   $focus->update if $focus;
-   $FOCUS->update;
+   0
 }
 
-sub focus_out {
+sub invoke_focus_out {
    my ($self) = @_;
 
    return unless $FOCUS == $self;
 
-   my $focus = $FOCUS; undef $FOCUS;
-
-   $self->_emit (focus_out => $focus);
+   undef $FOCUS;
 
-   $focus->update if $focus; #?
+   $self->update;
 
-   $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
+   $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
       unless $FOCUS;
+
+   0
+}
+
+sub grab_focus {
+   my ($self) = @_;
+
+   $FOCUS->emit ("focus_out") if $FOCUS;
+   $self->emit ("focus_in");
 }
 
-sub mouse_motion { 0 }
-sub button_up    { 0 }
-sub key_down     { 0 }
-sub key_up       { 0 }
+sub invoke_mouse_motion { 1 }
+sub invoke_button_up    { 1 }
+sub invoke_key_down     { 1 }
+sub invoke_key_up       { 1 }
 
-sub button_down {
+sub invoke_button_down {
    my ($self, $ev, $x, $y) = @_;
 
-   $self->focus_in;
+   $self->grab_focus;
 
-   0
+   1
+}
+
+sub connect {
+   my ($self, $signal, $cb) = @_;
+
+   push @{ $self->{signal_cb}{$signal} }, $cb;
+}
+
+sub emit {
+   my ($self, $signal, @args) = @_;
+
+   #d##TODO# stop propagating at first true, do not use sum
+   (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
+      || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)             # closure
+      || ($self->{parent} && $self->{parent}->emit ($signal, @args))              # parent
 }
 
 sub find_widget {
@@ -481,29 +501,6 @@
    $self->set_visible if $parent->{visible};
 }
 
-sub connect {
-   my ($self, $signal, $cb) = @_;
-
-   push @{ $self->{signal_cb}{$signal} }, $cb;
-}
-
-sub _emit {
-   my ($self, $signal, @args) = @_;
-
-   List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
-}
-
-sub emit {
-   my ($self, $signal, @args) = @_;
-
-   $self->_emit ($signal, @args)
-      || $self->$signal (@args);
-}
-
-sub visibility_change {
-   #my ($self, $visible) = @_;
-}
-
 sub realloc {
    my ($self) = @_;
 
@@ -544,8 +541,6 @@
    # 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)
@@ -594,6 +589,8 @@
 sub DESTROY {
    my ($self) = @_;
 
+   return if CFClient::in_destruct;
+
    delete $WIDGET{$self+0};
 
    eval { $self->destroy };
@@ -791,10 +788,12 @@
    $_[0]{children}[0]->size_request
 }
 
-sub size_allocate {
+sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
    $self->{children}[0]->configure (0, 0, $w, $h);
+
+   1
 }
 
 #############################################################################
@@ -820,11 +819,12 @@
    $self->SUPER::update;
 }
 
-sub size_allocate {
+sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
-   $self->SUPER::size_allocate ($w, $h);
    $self->update;
+
+   $self->SUPER::invoke_size_allocate ($w, $h)
 }
 
 sub _render {
@@ -895,7 +895,7 @@
    ($w, $h)
 }
 
-sub size_allocate {
+sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
    my $child = $self->child;
@@ -905,6 +905,8 @@
 
    $self->child->configure (0, 0, $w, $h);
    $self->update;
+
+   1
 }
 
 sub set_offset {
@@ -988,34 +990,36 @@
    $self
 }
 
+#TODO# update range on size_allocate depending on child
+
 sub add {
    my ($self, $widget) = @_;
 
    $self->{vp}->add ($self->{child} = $widget);
 }
 
+sub update_slider {
+   my ($self) = @_;
+
+   $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
+}
+
 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]);
+   $self->update_slider;
 }
 
-sub size_allocate {
+sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
-   $self->SUPER::size_allocate ($w, $h);
+   $self->update_slider;
 
-   my $child = $self->{vp}->child;
-   $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
+   $self->SUPER::invoke_size_allocate ($w, $h)
 }
 
-#TODO# update range on size_allocate depending on child
-# update viewport offset on scroll
-
 #############################################################################
 
 package CFClient::UI::Frame;
@@ -1092,6 +1096,15 @@
       fontsize => $self->{border},
          if exists $self->{title};
 
+   if ($self->{has_close_button}) {
+      $self->{close_button} =
+         new CFClient::UI::ImageButton
+            path        => 'x1_close.png',
+            on_activate => sub { $self->emit ("delete") };
+
+      $self->CFClient::UI::Container::add ($self->{close_button});
+   }
+
    $self
 }
 
@@ -1099,6 +1112,7 @@
    my ($self, @widgets) = @_;
 
    $self->SUPER::add (@widgets);
+   $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
    $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
 }
 
@@ -1112,6 +1126,9 @@
    $self->{title_widget}->size_request
       if $self->{title_widget};
 
+   $self->{close_button}->size_request
+      if $self->{close_button};
+
    my ($w, $h) = $self->SUPER::size_request;
 
    (
@@ -1120,24 +1137,37 @@
    )
 }
 
-sub size_allocate {
+sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
    if ($self->{title_widget}) {
       $self->{title_widget}{w} = $w;
       $self->{title_widget}{h} = $h;
-      $self->{title_widget}->size_allocate ($w, $h);
+      $self->{title_widget}->invoke_size_allocate ($w, $h);
    }
 
    my $border = $self->border;
 
    $h -= List::Util::max 0, $border * 2;
    $w -= List::Util::max 0, $border * 2;
-   
+
    $self->child->configure ($border, $border, $w, $h);
+
+   $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
+      if $self->{close_button};
+
+   1
 }
 
-sub button_down {
+sub invoke_delete {
+   my ($self) = @_;
+
+   $self->hide;
+   
+   1
+}
+
+sub invoke_button_down {
    my ($self, $ev, $x, $y) = @_;
 
    my ($w, $h) = @$self{qw(w h)};
@@ -1178,7 +1208,7 @@
 
          $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
          # HACK: the next line is required to enforce placement
-         $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
+         $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
       };
    } else {
       return 0;
@@ -1187,18 +1217,18 @@
    1
 }
 
-sub button_up {
+sub invoke_button_up {
    my ($self, $ev, $x, $y) = @_;
 
-   !!delete $self->{motion}
+   ! ! delete $self->{motion}
 }
 
-sub mouse_motion {
+sub invoke_mouse_motion {
    my ($self, $ev, $x, $y) = @_;
 
    $self->{motion}->($ev, $x, $y) if $self->{motion};
 
-   !!$self->{motion}
+   ! ! $self->{motion}
 }
 
 sub _draw {
@@ -1237,7 +1267,12 @@
    if ($self->{title_widget}) {
       glTranslate 0, $border - $self->{h};
       $self->{title_widget}->_draw;
+
+      glTranslate 0, - ($border - $self->{h});
    }
+
+   $self->{close_button}->draw
+      if $self->{close_button};
 }
 
 #############################################################################
@@ -1326,7 +1361,7 @@
    )
 }
 
-sub size_allocate {
+sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
    my ($ws, $hs) = $self->get_wh;
@@ -1368,6 +1403,7 @@
       $y += $row_h;
    }
 
+   1
 }
 
 sub find_widget {
@@ -1414,39 +1450,39 @@
          )
 }
 
-sub size_allocate {
+sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
    my $space = $self->{vertical} ? $h : $w;
-   my $children = $self->{children};
+   my @children = $self->visible_children;
 
    my @req;
 
    if ($self->{homogeneous}) {
-      @req = ($space / (@$children || 1)) x @$children;
+      @req = ($space / (@children || 1)) x @children;
    } else {
-      @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
+      @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
       my $req = List::Util::sum @req;
 
       if ($req > $space) {
          # ah well, not enough space
          $_ *= $space / $req for @req;
       } else {
-         my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
+         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;
+         $req[$_] += $space * $children[$_]{expand}
+            for 0 .. $#children;
       }
    }
 
    CFClient::UI::harmonize \@req;
 
    my $pos = 0;
-   for (0 .. $#$children) {
+   for (0 .. $#children) {
       my $alloc = $req[$_];
-      $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
+      $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
 
       $pos += $alloc;
    }
@@ -1559,7 +1595,6 @@
    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->{size_req};
@@ -1575,7 +1610,6 @@
 
    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->{size_req};
@@ -1597,6 +1631,7 @@
 
       if (exists $self->{template}) {
          $self->{template}->set_font ($self->{font}) if $self->{font};
+         $self->{template}->set_width ($self->{max_w} || -1);
          $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
 
          my ($w2, $h2) = $self->{template}->size;
@@ -1611,19 +1646,26 @@
    @{ $self->{size_req} }
 }
 
-sub size_allocate {
+sub baseline_shift {
+   $_[0]{layout}->descent
+}
+
+sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
    delete $self->{ox};
 
    delete $self->{texture}
       unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
+
+   1
 }
 
 sub set_fontsize {
    my ($self, $fontsize) = @_;
 
    $self->{fontsize} = $fontsize;
+   delete $self->{size_req};
    delete $self->{texture};
 
    $self->realloc;
@@ -1633,6 +1675,7 @@
    my ($self) = @_;
 
    delete $self->{size_req};
+   delete $self->{texture};
 
    $self->SUPER::reconfigure;
 }
@@ -1642,7 +1685,7 @@
 
    $self->SUPER::_draw; # draw background, if applicable
 
-   my $tex = $self->{texture} ||= do {
+   my $size = $self->{texture} ||= do {
       $self->{layout}->set_foreground (@{$self->{fg}});
       $self->{layout}->set_font ($self->{font}) if $self->{font};
       $self->{layout}->set_width ($self->{w});
@@ -1650,34 +1693,23 @@
       $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
       $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
 
-      new_from_layout CFClient::Texture $self->{layout}
+      [$self->{layout}->size]
    };
 
    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->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
+                       :                      ($self->{w} - $size->[0]) * 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);
+                       : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
+                       :                       ($self->{h} - $size->[1]) * 0.5);
    };
 
-   glEnable GL_TEXTURE_2D;
-
-   my $w = List::Util::min $self->{w} + 4, $tex->{w};
-   my $h = List::Util::min $self->{h} + 2, $tex->{h};
+   my $w = List::Util::min $self->{w} + 4, $size->[0];
+   my $h = List::Util::min $self->{h} + 2, $size->[1];
 
-   if ($tex->{format} == GL_ALPHA) {
-      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
-      glColor @{$self->{fg}};
-      $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
-   } else {
-      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-      $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
-   }
-
-   glDisable GL_TEXTURE_2D;
+   $self->{layout}->render ($self->{ox}, $self->{oy});
 }
 
 #############################################################################
@@ -1720,7 +1752,7 @@
    $self->{layout}->set_text ("$text ");
    delete $self->{size_req};
 
-   $self->_emit (changed => $self->{text});
+   $self->emit (changed => $self->{text});
 
    $self->realloc;
    $self->update;
@@ -1745,7 +1777,7 @@
    ($w + 1, $h) # add 1 for cursor
 }
 
-sub key_down {
+sub invoke_key_down {
    my ($self, $ev) = @_;
 
    my $mod = $ev->{mod};
@@ -1767,7 +1799,7 @@
    } elsif ($sym == CFClient::SDLK_END) {
       $self->{cursor} = length $text;
    } elsif ($uni == 27) {
-      $self->_emit ('escape');
+      $self->emit ('escape');
    } elsif ($uni) {
       substr $text, $self->{cursor}++, 0, chr $uni;
    } else {
@@ -1781,18 +1813,18 @@
    1
 }
 
-sub focus_in {
+sub invoke_focus_in {
    my ($self) = @_;
 
    $self->{last_activity} = $::NOW;
 
-   $self->SUPER::focus_in;
+   $self->SUPER::invoke_focus_in
 }
 
-sub button_down {
+sub invoke_button_down {
    my ($self, $ev, $x, $y) = @_;
 
-   $self->SUPER::button_down ($ev, $x, $y);
+   $self->SUPER::invoke_button_down ($ev, $x, $y);
 
    my $idx = $self->{layout}->xy_to_index ($x, $y);
 
@@ -1807,11 +1839,11 @@
    1
 }
 
-sub mouse_motion {
+sub invoke_mouse_motion {
    my ($self, $ev, $x, $y) = @_;
 #   printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
 
-   0
+   1
 }
 
 sub _draw {
@@ -1862,7 +1894,7 @@
 
 use CFClient::OpenGL;
 
-sub key_down {
+sub invoke_key_down {
    my ($self, $ev) = @_;
 
    my $sym = $ev->{sym};
@@ -1870,9 +1902,10 @@
    if ($sym == 13) {
       unshift @{$self->{history}},
          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) {
@@ -1898,7 +1931,7 @@
       }
 
    } else {
-      return $self->SUPER::key_down ($ev)
+      return $self->SUPER::invoke_key_down ($ev)
    }
 
    1
@@ -1932,9 +1965,7 @@
    )
 }
 
-sub activate { }
-
-sub button_up {
+sub invoke_button_up {
    my ($self, $ev, $x, $y) = @_;
 
    $self->emit ("activate")
@@ -1962,6 +1993,42 @@
 
 #############################################################################
 
+package CFClient::UI::ImageButton;
+
+our @ISA = CFClient::UI::Image::;
+
+use CFClient::OpenGL;
+
+my %textures;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      padding_x  => 4,
+      padding_y  => 4,
+      fg         => [1, 1, 1],
+      active_fg  => [0, 0, 1],
+      can_hover  => 1,
+      align      => 0,
+      valign     => 0,
+      can_events => 1,
+      @_
+   );
+}
+
+sub invoke_button_up {
+   my ($self, $ev, $x, $y) = @_;
+
+   $self->emit ("activate")
+      if $x >= 0 && $x < $self->{w}
+         && $y >= 0 && $y < $self->{h};
+
+   1
+}
+
+#############################################################################
+
 package CFClient::UI::CheckBox;
 
 our @ISA = CFClient::UI::DrawBG::;
@@ -1994,13 +2061,20 @@
    (6) x 2
 }
 
-sub button_down {
+sub toggle {
+   my ($self) = @_;
+
+   $self->{state} = !$self->{state};
+   $self->emit (changed => $self->{state});
+   $self->update;
+}
+
+sub invoke_button_down {
    my ($self, $ev, $x, $y) = @_;
 
    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->toggle;
    } else {
       return 0
    }
@@ -2035,25 +2109,26 @@
 our @ISA = CFClient::UI::Base::;
 
 use CFClient::OpenGL;
-use Carp qw/confess/;
 
-our %loaded_images;
+our %texture_cache;
 
 sub new {
    my $class = shift;
 
-   my $self = $class->SUPER::new (can_events => 0, @_);
-
-   $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
+   my $self = $class->SUPER::new (
+      can_events => 0,
+      @_,
+   );
 
-   $loaded_images{$self->{image}} ||=
-      new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
+   $self->{path}
+      or Carp::croak "required attribute 'path' not set";
 
-   my $tex = $self->{tex} = $loaded_images{$self->{image}};
+   $self->{tex} = $texture_cache{$self->{path}} ||=
+      new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
 
-   Scalar::Util::weaken $loaded_images{$self->{image}};
+   Scalar::Util::weaken $texture_cache{$self->{path}};
 
-   $self->{aspect} = $tex->{w} / $tex->{h};
+   $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
 
    $self
 }
@@ -2061,7 +2136,7 @@
 sub size_request {
    my ($self) = @_;
 
-   ($self->{tex}->{w}, $self->{tex}->{h})
+   ($self->{tex}{w}, $self->{tex}{h})
 }
 
 sub _draw {
@@ -2180,6 +2255,9 @@
 
    my $h1 = $self->{h} * (1 - $ycut1);
    my $h2 = $self->{h} * (1 - $ycut2);
+   my $h3 = $self->{h};
+
+   $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
 
    glEnable GL_BLEND;
    glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
@@ -2208,8 +2286,8 @@
       glBindTexture GL_TEXTURE_2D, $t3->{name};
       glBegin GL_QUADS;
       glTexCoord 0       , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
-      glTexCoord 0       , $t3->{t};                glVertex 0 , $self->{h};
-      glTexCoord $t3->{s}, $t3->{t};                glVertex $w, $self->{h};
+      glTexCoord 0       , $t3->{t};                glVertex 0 , $h3;
+      glTexCoord $t3->{s}, $t3->{t};                glVertex $w, $h3;
       glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
       glEnd;
    }
@@ -2307,8 +2385,6 @@
    $self
 }
 
-sub changed { }
-
 sub set_range {
    my ($self, $range) = @_;
 
@@ -2338,7 +2414,7 @@
    @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
 
    if ($value != $old_value) {
-      $self->_emit (changed => $value);
+      $self->emit (changed => $value);
       $self->update;
    }
 }
@@ -2349,17 +2425,17 @@
    ($self->{req_w}, $self->{req_h})
 }
 
-sub button_down {
+sub invoke_button_down {
    my ($self, $ev, $x, $y) = @_;
 
-   $self->SUPER::button_down ($ev, $x, $y);
+   $self->SUPER::invoke_button_down ($ev, $x, $y);
 
    $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
    
-   $self->mouse_motion ($ev, $x, $y)
+   $self->invoke_mouse_motion ($ev, $x, $y)
 }
 
-sub mouse_motion {
+sub invoke_mouse_motion {
    my ($self, $ev, $x, $y) = @_;
 
    if ($GRAB == $self) {
@@ -2490,7 +2566,7 @@
       #font      => default_font
       @_,
                  
-      layout     => (new CFClient::Layout 1),
+      layout     => (new CFClient::Layout),
       par        => [],
       height     => 0,
       children   => [
@@ -2511,30 +2587,51 @@
    $self->reflow;
 }
 
-sub size_allocate {
+sub size_request {
+   my ($self) = @_;
+
+   my ($empty, $slider) = @{ $self->{children} };
+
+   local $self->{children} = [$empty, $slider];
+   $self->SUPER::size_request
+}
+
+sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
-   $self->SUPER::size_allocate ($w, $h);
+   my ($empty, $slider, @other) = @{ $self->{children} };
+   $_->configure (@$_{qw(x y req_w req_h)}) for @other;
 
    $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->{layout}->set_width ($empty->{w});
    $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
 
    $self->reflow;
+
+   local $self->{children} = [$empty, $slider];
+   $self->SUPER::invoke_size_allocate ($w, $h)
 }
 
-sub text_size {
-   my ($self, $text, $indent) = @_;
+sub get_layout {
+   my ($self, $para) = @_;
 
    my $layout = $self->{layout};
 
+   $layout->set_font ($self->{font}) if $self->{font};
+   $layout->set_foreground (@{$para->{fg}});
    $layout->set_height ($self->{fontsize} * $::FONTSIZE);
-   $layout->set_width ($self->{children}[0]{w} - $indent);
+   $layout->set_width ($self->{children}[0]{w} - $para->{indent});
    $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
-   $layout->set_markup ($text);
-   
-   $layout->size
+   $layout->set_markup ($para->{markup});
+
+   $layout->set_shapes (
+      map
+         +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
+         @{$para->{widget}}
+   );
+
+   $layout
 }
 
 sub reflow {
@@ -2554,21 +2651,40 @@
 sub clear {
    my ($self) = @_;
 
+   my (undef, undef, @other) = @{ $self->{children} };
+   $self->remove ($_) for @other;
+
    $self->{par} = [];
    $self->{height} = 0;
    $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
 }
 
 sub add_paragraph {
-   my ($self, $color, $text, $indent) = @_;
+   my ($self, $color, $para, $indent) = @_;
 
-   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];
-   }
+   my ($text, @w) = ref $para ? @$para : $para;
+
+   $para = {
+      w       => 1e10,
+      wrapped => 1,
+      fg      => $color,
+      indent  => $indent,
+      markup  => $text,
+      widget  => \@w,
+   };
 
-   $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
+   $self->add (@w) if @w;
+   push @{$self->{par}}, $para;
+
+   $self->{need_reflow}++;
+   $self->update;
+}
+
+sub scroll_to_bottom {
+   my ($self) = @_;
+
+   $self->{scroll_to_bottom} = 1;
+   $self->update;
 }
 
 sub update {
@@ -2586,30 +2702,30 @@
       if (delete $self->{need_reflow}) {
          my $height = 0;
 
-         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_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
-               $layout->set_markup ($_->[4]);
+         for my $para (@{$self->{par}}) {
+            if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
+               my $layout = $self->get_layout ($para);
                my ($w, $h) = $layout->size;
-               $_->[0] = $w + $_->[3];
-               $_->[1] = $h;
+
+               $para->{w}       = $w + $para->{indent};
+               $para->{h}       = $h;
+               $para->{wrapped} = $layout->has_wrapped;
             }
 
-            $height += $_->[1];
+            $height += $para->{h};
          }
 
          $self->{height} = $height;
 
-         $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
+         $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
 
          delete $self->{texture};
       }
 
+      if (delete $self->{scroll_to_bottom}) {
+         $self->{children}[1]->set_value (1e10);
+      }
+
       $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
          glClearColor 0, 0, 0, 0;
          glClear GL_COLOR_BUFFER_BIT;
@@ -2621,37 +2737,44 @@
 
          my $y = 0;
 
-         my $layout = $self->{layout};
+         for my $para (@{$self->{par}}) {
+            my $h = $para->{h};
 
-         $layout->set_font ($self->{font}) if $self->{font};
+            if ($y0 < $y + $h && $y < $y1) {
 
-         glEnable GL_BLEND;
-         #TODO# not correct in windows where rgba is forced off
-         glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+               my $layout = $self->get_layout ($para);
 
-         for my $par (@{$self->{par}}) {
-            my $h = $par->[1];
+               $layout->render ($para->{indent}, $y - $y0);
 
-            if ($y0 < $y + $h && $y < $y1) {
-               $layout->set_foreground (@{ $par->[2] });
-               $layout->set_width ($W - $par->[3]);
-               $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
-               $layout->set_markup ($par->[4]);
+               if (my @w = @{ $para->{widget} }) {
+                  my @s = $layout->get_shapes;
 
-               my ($w, $h, $data, $format, $internalformat) = $layout->render;
+                  for (@w) {
+                     my ($dx, $dy) = splice @s, 0, 2, ();
 
-               glRasterPos $par->[3], $y - $y0;
-               glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
+                     $_->{x} = $dx + $para->{indent};
+                     $_->{y} = $dy + $y - $y0;
+
+                     $_->draw;
+                  }
+               }
             }
 
             $y += $h;
          }
-
-         glDisable GL_BLEND;
       };
    });
 }
 
+sub reconfigure {
+   my ($self) = @_;
+
+   $self->SUPER::reconfigure;
+
+   $_->{w} = 1e10 for @{ $self->{par} };
+   $self->reflow;
+}
+
 sub _draw {
    my ($self) = @_;
 
@@ -2662,7 +2785,6 @@
    glDisable GL_TEXTURE_2D;
 
    $self->{children}[1]->draw;
-
 }
 
 #############################################################################
@@ -2781,13 +2903,13 @@
    ($w + 4, $h + 4)
 }
 
-sub size_allocate {
+sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
-   $self->SUPER::size_allocate ($w - 4, $h - 4);
+   $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
 }
 
-sub visibility_change {
+sub invoke_visibility_change {
    my ($self, $visible) = @_;
 
    return unless $visible;
@@ -2945,11 +3067,26 @@
 
       # handle various types of items, only text for now
       if (!ref $widget) {
-         $widget = new CFClient::UI::Label
-            can_hover  => 1,
-            can_events => 1,
-            markup     => $widget,
-            tooltip    => $tooltip
+         if ($widget =~ /\t/) {
+            my ($left, $right) = split /\t/, $widget, 2;
+
+            $widget = new CFClient::UI::HBox
+               can_hover  => 1,
+               can_events => 1,
+               tooltip    => $tooltip,
+               children   => [
+                  (new CFClient::UI::Label markup => $left, expand => 1),
+                  (new CFClient::UI::Label markup => $right, align => +1),
+               ],
+            ;
+               
+         } else {
+            $widget = new CFClient::UI::Label
+               can_hover  => 1,
+               can_events => 1,
+               markup     => $widget,
+               tooltip    => $tooltip;
+         }
       }
 
       $self->{item}{$widget} = $item;
@@ -2964,7 +3101,7 @@
 sub popup {
    my ($self, $ev) = @_;
 
-   $self->_emit ("popdown");
+   $self->emit ("popdown");
 
    # maybe save $GRAB? must be careful about events...
    $GRAB = $self;
@@ -2974,7 +3111,7 @@
    $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
 }
 
-sub mouse_motion {
+sub invoke_mouse_motion {
    my ($self, $ev, $x, $y) = @_;
 
    # TODO: should use vbox->find_widget or so
@@ -2984,14 +3121,14 @@
    0
 }
 
-sub button_up {
+sub invoke_button_up {
    my ($self, $ev, $x, $y) = @_;
 
    if ($ev->{button} == $self->{button}) {
       undef $GRAB;
       $self->hide;
 
-      $self->_emit ("popdown");
+      $self->emit ("popdown");
       $self->{hover}[1]->() if $self->{hover};
    } else {
       return 0
@@ -3028,6 +3165,12 @@
       if @{ $self->{children} };
 }
 
+sub get_current_page {
+   my ($self) = @_;
+
+   $self->{current}
+}
+
 sub set_current_page {
    my ($self, $page_or_widget) = @_;
 
@@ -3038,7 +3181,7 @@
    $self->{current} = $widget;
    $self->{current}->configure (0, 0, $self->{w}, $self->{h});
 
-   $self->_emit (page_changed => $self->{current});
+   $self->emit (page_changed => $self->{current});
 
    $self->realloc;
 }
@@ -3053,10 +3196,12 @@
    $self->{current}->size_request
 }
 
-sub size_allocate {
+sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
    $self->{current}->configure (0, 0, $w, $h);
+
+   1
 }
 
 sub _draw {
@@ -3101,11 +3246,17 @@
    $self->{multiplexer}->add ($widget);
 }
 
+sub get_current_page {
+   my ($self) = @_;
+
+   $self->{multiplexer}->get_current_page
+}
+
 sub set_current_page {
    my ($self, $page) = @_;
 
    $self->{multiplexer}->set_current_page ($page);
-   $self->_emit (page_changed => $self->{multiplexer}{current});
+   $self->emit (page_changed => $self->{multiplexer}{current});
 }
 
 #############################################################################
@@ -3130,7 +3281,7 @@
    $self
 }
 
-sub button_down {
+sub invoke_button_down {
    my ($self, $ev) = @_;
 
    my @menu_items;
@@ -3161,7 +3312,7 @@
    return unless $self->{value} ne $value;
 
    $self->_set_value ($value);
-   $self->_emit (changed => $value);
+   $self->emit (changed => $value);
 }
 
 #############################################################################
@@ -3286,7 +3437,9 @@
       };
    }
 
-   $self->reorder;
+   $ROOT->on_refresh (reorder => sub {
+      $self->reorder;
+   });
 }
 
 sub reconfigure {
@@ -3311,13 +3464,13 @@
 
 package CFClient::UI::Inventory;
 
-our @ISA = CFClient::UI::ScrolledWindow::;
+our @ISA = CFClient::UI::Table::;
 
 sub new {
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
+      col_expand => [0, 1, 0],
       @_,
    );
 
@@ -3327,13 +3480,13 @@
 sub set_items {
    my ($self, $items) = @_;
 
-   $self->{child}->clear;
+   $self->clear;
    return unless $items;
 
    my @items = sort {
       ($a->{type} <=> $b->{type})
          or ($a->{name} cmp $b->{name})
-   } @$items;
+   } values %$items;
 
    $self->{real_items} = \@items;
 
@@ -3341,9 +3494,9 @@
    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});
+      $self->add (0, $row, $item->{face_widget});
+      $self->add (1, $row, $item->{desc_widget});
+      $self->add (2, $row, $item->{weight_widget});
 
       $row++;
    }
@@ -3351,203 +3504,6 @@
 
 #############################################################################
 
-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::;
@@ -3606,7 +3562,7 @@
             } elsif ($ev->{button} == 3) {
                (new CFClient::UI::Menu
                   items => [
-                     ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
+                     ["bind <i>cast $spell->{name}</i> to a key"   => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
                      ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
                   ],
                )->popup ($ev);
@@ -3711,7 +3667,7 @@
    int $coord + 0.5
 }
 
-sub size_allocate {
+sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
    for my $child ($self->children) {
@@ -3725,6 +3681,8 @@
 
       $child->configure ($X, $Y, $W, $H);
    }
+
+   1
 }
 
 sub coord2local {