--- deliantra/Deliantra-Client/DC/UI.pm	2006/10/01 12:08:58	1.351
+++ deliantra/Deliantra-Client/DC/UI.pm	2007/07/20 16:32:04	1.383
@@ -3,7 +3,6 @@
 use utf8;
 use strict;
 
-use Scalar::Util ();
 use List::Util ();
 use Event;
 
@@ -25,9 +24,11 @@
       for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
          if (length $widget->{tooltip}) {
             if ($TOOLTIP->{owner} != $widget) {
+               $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
                $TOOLTIP->hide;
 
                $TOOLTIP->{owner} = $widget;
+               $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
 
                return if $ENV{CFPLUS_DEBUG} & 8;
 
@@ -45,6 +46,7 @@
    }
 
    $TOOLTIP->hide;
+   $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
    delete $TOOLTIP->{owner};
 });
 
@@ -237,7 +239,7 @@
       @_
    }, $class;
 
-   Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
+   CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
 
    for (keys %$self) {
       if (/^on_(.*)$/) {
@@ -264,9 +266,14 @@
    my ($self) = @_;
 
    $self->hide;
+   $self->emit ("destroy");
    %$self = ();
 }
 
+sub TO_JSON {
+   { __widget_ref__ => $_[0]{s_id} }
+}
+
 sub show {
    my ($self) = @_;
 
@@ -315,8 +322,8 @@
 
    return if $self->{visible} == $visible;
 
-   $visible ? $self->hide
-            : $self->show;
+   $visible ? $self->show
+            : $self->hide;
 }
 
 sub toggle_visibility {
@@ -506,6 +513,12 @@
    }
 }
 
+sub disconnect_all {
+   my ($self, $signal) = @_;
+
+   delete $self->{signal_cb}{$signal};
+}
+
 my %has_coords = (
    button_down  => 1,
    button_up    => 1,
@@ -516,8 +529,8 @@
 sub emit {
    my ($self, $signal, @args) = @_;
 
-   # I do not really like this solution, but I dislike duplication
-   # and needlessly verbose code, too.
+   # I do not really like this solution, but I do not like duplication
+   # and needlessly verbose code, either.
    my @append
       = $has_coords{$signal}
         ? $args[0]->xy ($self)
@@ -525,10 +538,15 @@
 
    #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
 
-   #d##TODO# stop propagating at first true, do not use sum
-   (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
-      || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append)             # closure
-      || ($self->{parent} && $self->{parent}->emit ($signal, @args))                       # parent
+   for my $cb (
+      @{$self->{signal_cb}{$signal} || []},		# before
+      ($self->can ("invoke_$signal") || sub { 1 }),	# closure
+   ) {
+      return $cb->($self, @args, @append) || next;
+   }
+
+   # parent
+   $self->{parent} && $self->{parent}->emit ($signal, @args)
 }
 
 sub find_widget {
@@ -546,7 +564,7 @@
 sub set_parent {
    my ($self, $parent) = @_;
 
-   Scalar::Util::weaken ($self->{parent} = $parent);
+   CFPlus::weaken ($self->{parent} = $parent);
    $self->set_visible if $parent->{visible};
 }
 
@@ -635,15 +653,16 @@
    warn "no draw defined for $self\n";
 }
 
+my $cntx;#d#
 sub DESTROY {
    my ($self) = @_;
 
    return if CFPlus::in_destruct;
 
-   delete $WIDGET{$self+0};
-
    eval { $self->destroy };
    warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
+
+   delete $WIDGET{$self+0};
 }
 
 #############################################################################
@@ -902,9 +921,9 @@
 
          local ($draw_x, $draw_y, $draw_w, $draw_h) =
             (0, 0, $self->{w}, $self->{h});
-      }
 
-      $self->_render;
+         $self->_render;
+      }
    };
 }
 
@@ -927,6 +946,8 @@
 
 package CFPlus::UI::ViewPort;
 
+use List::Util qw(min max);
+
 our @ISA = CFPlus::UI::Window::;
 
 sub new {
@@ -967,10 +988,16 @@
 sub set_offset {
    my ($self, $x, $y) = @_;
 
-   $self->{view_x} = int $x;
-   $self->{view_y} = int $y;
+   my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
+   my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
 
-   $self->update;
+   if ($x != $self->{view_x} or $y != $self->{view_y}) {
+      $self->{view_x} = $x;
+      $self->{view_y} = $y;
+
+      $self->emit (changed => $x, $y);
+      $self->update;
+   }
 }
 
 # hmm, this does not work for topleft of $self... but we should not ask for that
@@ -1016,7 +1043,7 @@
 
 package CFPlus::UI::ScrolledWindow;
 
-our @ISA = CFPlus::UI::HBox::;
+our @ISA = CFPlus::UI::Table::;
 
 sub new {
    my ($class, %arg) = @_;
@@ -1025,22 +1052,51 @@
 
    my $self;
 
-   my $slider = new CFPlus::UI::Slider
+   my $hslider = new CFPlus::UI::Slider
+      vertical   => 0,
+      range      => [0, 0, 1, 0.01], # HACK fix
+      on_changed => sub {
+         $self->{hpos} = $_[1];
+         $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
+      },
+   ;
+
+   my $vslider = new CFPlus::UI::Slider
       vertical   => 1,
       range      => [0, 0, 1, 0.01], # HACK fix
       on_changed => sub {
-         $self->{vp}->set_offset (0, $_[1]);
+         $self->{vpos} = $_[1];
+         $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
       },
    ;
 
    $self = $class->SUPER::new (
-      vp         => (new CFPlus::UI::ViewPort expand => 1),
+      scroll_x   => 0,
+      scroll_y   => 1,
       can_events => 1,
-      slider     => $slider,
+      hslider    => $hslider,
+      vslider    => $vslider,
+      col_expand => [1, 0],
+      row_expand => [1, 0],
       %arg,
    );
 
-   $self->SUPER::add ($self->{vp}, $self->{slider});
+   $self->{vp} = new CFPlus::UI::ViewPort
+      expand     => 1,
+      scroll_x   => $self->{scroll_x},
+      scroll_y   => $self->{scroll_y},
+      on_changed => sub {
+         my ($vp, $x, $y) = @_;
+
+         $vp->{parent}{hslider}->set_value ($x);
+         $vp->{parent}{vslider}->set_value ($y);
+
+         0
+      },
+   ;
+
+   $self->SUPER::add_at (0, 0, $self->{vp});
+
    $self->add ($child) if $child;
 
    $self
@@ -1054,35 +1110,94 @@
    $self->{vp}->add ($self->{child} = $widget);
 }
 
+sub update_slider {
+   my ($self) = @_;
+
+   my $child = ($self->{vp} or return)->child;
+
+   my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
+   $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
+
+   my $visible = $w1 > $w2;
+   if ($visible != $self->{hslider}{visible}) {
+      $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
+               : $self->{hslider}->hide;
+   }
+
+   my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
+   $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
+
+   my $visible = $h1 > $h2;
+   if ($visible != $self->{vslider}{visible}) {
+      $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
+               : $self->{vslider}->hide;
+   }
+}
+
+sub update {
+   my ($self) = @_;
+
+   $self->SUPER::update;
+   $self->update_slider;
+}
+
 sub invoke_mouse_wheel {
    my ($self, $ev) = @_;
 
-   return 0 unless $ev->{dy}; # only vertical movements
+   return 0 unless $ev->{dy}; # only vertical movements for now
 
-   $self->{slider}->emit (mouse_wheel => $ev);
+   $self->{vslider}->emit (mouse_wheel => $ev);
 
    1
 }
 
-sub update_slider {
-   my ($self) = @_;
+sub invoke_button_down {
+   my ($self, $ev, $x, $y) = @_;
+
+   if ($ev->{button} == 2) {
+      $self->grab_focus;
+
+      my $ox = $self->{vp}{view_x} + $ev->{x};
+      my $oy = $self->{vp}{view_y} + $ev->{y};
+      
+      $self->{motion} = sub {
+         my ($ev, $x, $y) = @_;
+
+         $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
+         $self->update;
+      };
 
-   $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
+      return 1;
+   }
+
+   0
 }
 
-sub update {
-   my ($self) = @_;
+sub invoke_button_up {
+   my ($self, $ev, $x, $y) = @_;
 
-   $self->SUPER::update;
+   if (delete $self->{motion}) {
+      return 1;
+   }
 
-   $self->update_slider;
+   0
+}
+
+sub invoke_mouse_motion {
+   my ($self, $ev, $x, $y) = @_;
+
+   if ($self->{motion}) {
+      $self->{motion}->($ev, $x, $y);
+      return 1;
+   }
+
+   0
 }
 
 sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
    $self->update_slider;
-
    $self->SUPER::invoke_size_allocate ($w, $h)
 }
 
@@ -1242,6 +1357,10 @@
       map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
          qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
 
+my @icon =
+      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+         qw(x1_move.png x1_resize.png);
+
 sub new {
    my ($class, %arg) = @_;
 
@@ -1419,10 +1538,24 @@
    my $border = $self->border;
 
    glColor @{ $self->{border_bg} };
-   $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);
+   $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);
+
+   # move
+   my $w2 = ($w - $border) * .5;
+   my $h2 = ($h - $border) * .5;
+   $icon[0]->draw_quad_alpha (           0,          $h2, $border, $border);
+   $icon[0]->draw_quad_alpha ($w - $border,          $h2, $border, $border);
+   $icon[0]->draw_quad_alpha ($w2         , $h - $border, $border, $border);
+
+   # resize
+   $icon[1]->draw_quad_alpha (           0,            0, $border, $border);
+   $icon[1]->draw_quad_alpha ($w - $border,            0, $border, $border)
+      unless $self->{has_close_button};
+   $icon[1]->draw_quad_alpha (           0, $h - $border, $border, $border);
+   $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
 
    if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
       glColor @{ $self->{bg} };
@@ -1463,7 +1596,9 @@
    my $class = shift;
 
    $class->SUPER::new (
+      children   => [],
       col_expand => [],
+      row_expand => [],
       @_,
    )
 }
@@ -1472,16 +1607,25 @@
    grep $_, map @$_, grep $_, @{ $_[0]{children} }
 }
 
+# TODO: store row/col info in child widget and use standard add/del
 sub add {
-   my ($self) = shift;
+   my $self = shift;
+
+   Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
+   $self->add_at (@_);
+}
+
+sub add_at {
+   my $self = shift;
 
    while (@_) {
-      my ($x, $y, $child) = splice @_, 0, 3, ();
+      my ($col, $row, $child) = splice @_, 0, 3, ();
+
       $child->set_parent ($self);
-      $self->{children}[$y][$x] = $child;
+      $self->{children}[$row][$col] = $child;
    }
 
-   $self->{force_realloc} = 1;
+   $self->{force_realloc}    = 1;
    $self->{force_size_alloc} = 1;
    $self->realloc;
 }
@@ -1489,7 +1633,11 @@
 sub remove {
    my ($self, $child) = @_;
 
-   # TODO: not yet implemented
+   for (@{ $self->{children} }) {
+      for (@{ $_ || [] }) {
+         $_ = undef if $_ == $child;
+      }
+   }
 }
 
 # TODO: move to container class maybe? send children a signal on removal?
@@ -1548,16 +1696,21 @@
    my $req_w = (sum @$ws) || 1;
    my $req_h = (sum @$hs) || 1;
 
-   # TODO: nicer code && do row_expand
+   # TODO: nicer code
    my @col_expand = @{$self->{col_expand}};
    @col_expand = (1) x @$ws unless @col_expand;
    my $col_expand = (sum @col_expand) || 1;
 
-   # linearly scale sizes
    $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
-   $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
 
    CFPlus::UI::harmonize $ws;
+
+   my @row_expand = @{$self->{row_expand}};
+   @row_expand = (1) x @$ws unless @row_expand;
+   my $row_expand = (sum @row_expand) || 1;
+
+   $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
+
    CFPlus::UI::harmonize $hs;
 
    my $y;
@@ -1611,6 +1764,88 @@
 
 #############################################################################
 
+package CFPlus::UI::Fixed;
+
+use List::Util qw(min max);
+
+our @ISA = CFPlus::UI::Container::;
+
+sub add {
+   my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
+
+   $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
+   $self->SUPER::add ($child);
+}
+
+sub _scale($$$) {
+   my ($mode, $val, $max) = @_;
+
+   $mode eq "abs"   ? $val
+   : $mode eq "rel" ? $val * $max
+   :                  0
+}
+
+sub size_request {
+   my ($self) = @_;
+
+   my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
+
+   # determine overall size by querying abs widgets
+   for my $child ($self->visible_children) {
+      my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
+
+      if ($pos eq "abs") {
+         $w = _scale $size, $w, $child->{req_w};
+         $h = _scale $size, $h, $child->{req_h};
+
+         $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
+         $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
+      }
+   }
+
+   my $W = $x2 - $x1;
+   my $H = $y2 - $y1;
+
+   # now layout remaining widgets
+   for my $child ($self->visible_children) {
+      my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
+
+      if ($pos ne "abs") {
+         $x = _scale $pos,  $x, $W;
+         $y = _scale $pos,  $x, $H;
+         $w = _scale $size, $w, $child->{req_w};
+         $h = _scale $size, $h, $child->{req_h};
+
+         $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
+         $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
+      }
+   }
+
+   my $W = $x2 - $x1;
+   my $H = $y2 - $y1;
+
+   ($W, $H)
+}
+
+sub invoke_size_allocate {
+   my ($self, $W, $H) = @_;
+
+   for my $child ($self->visible_children) {
+      my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
+
+      $x = _scale $pos,  $x, $W;
+      $y = _scale $pos,  $x, $H;
+      $w = _scale $size, $w, $child->{req_w};
+      $h = _scale $size, $h, $child->{req_h};
+
+      $child->configure ($x, $y, $w, $h);
+   }
+
+   1
+}
+
+#############################################################################
+
 package CFPlus::UI::Box;
 
 our @ISA = CFPlus::UI::Container::;
@@ -1902,6 +2137,7 @@
       can_focus  => 1,
       valign     => 0,
       can_events => 1,
+      ellipsise  => 0,
       #text      => ...
       #hidden    => "*",
       @_
@@ -1956,6 +2192,8 @@
 
    my $text = $self->get_text;
 
+   $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
+
    if ($uni == 8) {
       substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
    } elsif ($uni == 127) {
@@ -1965,15 +2203,25 @@
    } elsif ($sym == CFPlus::SDLK_RIGHT) {
       ++$self->{cursor} if $self->{cursor} < length $self->{text};
    } elsif ($sym == CFPlus::SDLK_HOME) {
-      $self->{cursor} = 0;
+      # what a hack
+      $self->{cursor} =
+         (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
+            ? length $1
+            : 0;
    } elsif ($sym == CFPlus::SDLK_END) {
-      $self->{cursor} = length $text;
-   } elsif ($uni ==  21) { # ctrl-u
+      # uh, again
+      $self->{cursor} =
+         (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
+            ? $self->{cursor} + length $1
+            : length $self->{text};
+   } elsif ($uni == 21) { # ctrl-u
       $text = "";
       $self->{cursor} = 0;
    } elsif ($uni == 27) {
       $self->emit ('escape');
-   } elsif ($uni) {
+   } elsif ($uni == 0x0d) {
+      substr $text, $self->{cursor}++, 0, "\012";
+   } elsif ($uni >= 0x20) {
       substr $text, $self->{cursor}++, 0, chr $uni;
    } else {
       return 0;
@@ -1982,6 +2230,7 @@
    $self->_set_text ($text);
 
    $self->realloc;
+   $self->update;
 
    1
 }
@@ -2060,6 +2309,8 @@
    }
 }
 
+#############################################################################
+
 package CFPlus::UI::Entry;
 
 our @ISA = CFPlus::UI::EntryBase::;
@@ -2071,7 +2322,7 @@
 
    my $sym = $ev->{sym};
 
-   if ($sym == 13) {
+   if ($ev->{uni} == 0x0d || $sym == 13) {
       unshift @{$self->{history}},
          my $txt = $self->get_text;
 
@@ -2111,6 +2362,45 @@
 
 #############################################################################
 
+package CFPlus::UI::TextEdit;
+
+our @ISA = CFPlus::UI::EntryBase::;
+
+use CFPlus::OpenGL;
+
+sub move_cursor_ver {
+   my ($self, $dy) = @_;
+
+   my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
+
+   $y += $dy;
+
+   if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
+      $self->{cursor} = $index;
+      delete $self->{cur_h};
+      $self->update;
+      return;
+   }
+}
+
+sub invoke_key_down {
+   my ($self, $ev) = @_;
+
+   my $sym = $ev->{sym};
+
+   if ($sym == CFPlus::SDLK_UP) {
+      $self->move_cursor_ver (-1);
+   } elsif ($sym == CFPlus::SDLK_DOWN) {
+      $self->move_cursor_ver (+1);
+   } else {
+      return $self->SUPER::invoke_key_down ($ev)
+   }
+
+   1
+}
+
+#############################################################################
+
 package CFPlus::UI::Button;
 
 our @ISA = CFPlus::UI::Label::;
@@ -2119,7 +2409,7 @@
 
 my @tex =
       map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
-         qw(b1_button_active.png);
+         qw(b1_button_inactive.png b1_button_active.png);
 
 sub new {
    my $class = shift;
@@ -2127,8 +2417,8 @@
    $class->SUPER::new (
       padding_x  => 4,
       padding_y  => 4,
-      fg         => [1, 1, 1],
-      active_fg  => [0, 0, 1],
+      fg         => [1.0, 1.0, 1.0],
+      active_fg  => [0.8, 0.8, 0.8],
       can_hover  => 1,
       align      => 0,
       valign     => 0,
@@ -2156,7 +2446,8 @@
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
    glColor 0, 0, 0, 1;
 
-   $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
+   my $tex = $tex[$GRAB == $self];
+   $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
 
    glDisable GL_TEXTURE_2D;
 
@@ -2262,7 +2553,7 @@
    $self->{tex} ||= $texture_cache{$self->{path}} ||=
       new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
 
-   Scalar::Util::weaken $texture_cache{$self->{path}};
+   CFPlus::weaken $texture_cache{$self->{path}};
 
    $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
 
@@ -2645,7 +2936,9 @@
 
    my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
 
-   $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
+   my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
+
+   $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
 
    ! ! $delta
 }
@@ -2765,6 +3058,7 @@
                  
       layout     => (new CFPlus::Layout),
       par        => [],
+      max_par    => 0,
       height     => 0,
       children   => [
          (new CFPlus::UI::Empty expand => 1),
@@ -2899,6 +3193,10 @@
       push @{$self->{par}}, $para;
    }
 
+   if (my $max = $self->{max_par}) {
+      shift @{$self->{par}} while @{$self->{par}} > $max;
+   }
+
    $self->{need_reflow}++;
    $self->update;
 }
@@ -2961,12 +3259,9 @@
          glClearColor 0, 0, 0, 0;
          glClear GL_COLOR_BUFFER_BIT;
 
-         {
-            package CFPlus::UI::Base;
-
-            local ($draw_x, $draw_y, $draw_w, $draw_h) =
-               (0, 0, $self->{w}, $self->{h});
-         }
+         package CFPlus::UI::Base;
+         local ($draw_x, $draw_y, $draw_w, $draw_h) =
+            (0, 0, $self->{w}, $self->{h});
 
          my $top = int $self->{children}[1]{range}[0];
 
@@ -3217,30 +3512,84 @@
    my $class = shift;
 
    my $self = $class->SUPER::new (
+      size_w     => 32,
+      size_h     => 8,
       aspect     => 1,
       can_events => 0,
       @_,
    );
 
    if ($self->{anim} && $self->{animspeed}) {
-      Scalar::Util::weaken (my $widget = $self);
+      CFPlus::weaken (my $widget = $self);
 
+      $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
+      $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
       $self->{timer} = Event->timer (
-         at       => $self->{animspeed} * int $::NOW / $self->{animspeed},
-         hard     => 1,
-         interval => $self->{animspeed},
+         parked   => 1,
          cb       => sub {
+            return unless $::CONN && $widget;
+
             ++$widget->{frame};
+            $widget->update_face;
             $widget->update;
+
+            $widget->update_timer;
          },
       );
+
+      $self->update_face;
+      $self->update_timer;
    }
    
    $self
 }
 
+sub update_timer {
+   my ($self) = @_;
+
+   return unless $self->{timer};
+
+   if ($self->{visible}) {
+      $self->{timer}->at (
+         $self->{anim_start}
+         + $self->{animspeed}
+           * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
+      );
+      $self->{timer}->start;
+   } else {
+      $self->{timer}->stop;
+   }
+}
+
+sub update_face {
+   my ($self) = @_;
+
+   return unless $::CONN;
+
+   if (my $anim = $::CONN->{anim}[$self->{anim}]) {
+      if ($anim && @$anim) {
+         delete $self->{wait_face};
+         $self->{face} = $anim->[ $self->{frame} % @$anim ];
+      }
+   }
+}
+
 sub size_request {
-   (32, 8)
+   my ($self) = @_;
+
+   if ($::CONN) {
+      if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
+         if (my $tex = $::CONN->{texture}[$faceid]) {
+            return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
+         } else {
+            $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
+               $self->realloc;
+            });
+         }
+      }
+   }
+
+   ($self->{size_w} || 8, $self->{size_h} || 8)
 }
 
 sub update {
@@ -3251,6 +3600,14 @@
    $self->SUPER::update;
 }
 
+sub invoke_visibility_change {
+   my ($self) = @_;
+
+   $self->update_timer;
+
+   0
+}
+
 sub _draw {
    my ($self) = @_;
 
@@ -3258,16 +3615,10 @@
 
    $self->SUPER::_draw;
 
-   my $face;
-
-   if ($self->{frame}) {
-      my $anim = $::CONN->{anim}[$self->{anim}];
-
-      $face = $anim->[ $self->{frame} % @$anim ]
-         if $anim && @$anim;
-   }
+   my $faceid = $::CONN->{faceid}[$self->{face}]
+      or return;
    
-   my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
+   my $tex = $::CONN->{texture}[$faceid];
 
    if ($tex) {
       glEnable GL_TEXTURE_2D;
@@ -3281,7 +3632,7 @@
 sub destroy {
    my ($self) = @_;
 
-   $self->{timer}->cancel
+   (delete $self->{timer})->cancel
       if $self->{timer};
 
    $self->SUPER::destroy;
@@ -3293,7 +3644,7 @@
 
 our @ISA = CFPlus::UI::HBox::;
 
-# TODO: should actualyl wrap buttons and other goodies.
+# TODO: should actually wrap buttons and other goodies.
 
 #############################################################################
 
@@ -3487,7 +3838,7 @@
 sub add {
    my ($self, $title, $widget, $tooltip) = @_;
 
-   Scalar::Util::weaken $self;
+   CFPlus::weaken $self;
 
    $self->{buttonbar}->add (new CFPlus::UI::Button
       markup      => $title,
@@ -3581,7 +3932,7 @@
       @_,
    );
 
-   Scalar::Util::weaken (my $this = $self);
+   CFPlus::weaken (my $this = $self);
 
    $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
 
@@ -3714,190 +4065,6 @@
 
 #############################################################################
 
-package CFPlus::UI::Inventory;
-
-our @ISA = CFPlus::UI::Table::;
-
-sub new {
-   my $class = shift;
-
-   my $self = $class->SUPER::new (
-      col_expand => [0, 1, 0],
-      items      => [],
-      @_,
-   );
-
-   $self->set_sort_order (undef);
-
-   $self
-}
-
-sub update_items {
-   my ($self) = @_;
-
-   $self->clear;
-
-   my @item = $self->{sort}->(@{ $self->{items} });
-
-   my @adds;
-   my $row = 0;
-   for my $item ($self->{sort}->(@{ $self->{items} })) {
-      CFPlus::Item::update_widgets $item;
-
-      push @adds, 0, $row, $item->{face_widget};
-      push @adds, 1, $row, $item->{desc_widget};
-      push @adds, 2, $row, $item->{weight_widget};
-
-      $row++;
-   }
-
-   $self->add (@adds);
-}
-
-sub set_sort_order {
-   my ($self, $order) = @_;
-
-   $self->{sort} = $order ||= sub {
-      sort {
-         $a->{type} <=> $b->{type}
-            or $a->{name} cmp $b->{name}
-      } @_
-   };
-
-   $self->update_items;
-}
-
-sub set_items {
-   my ($self, $items) = @_;
-
-   $self->{items} = [$items ? values %$items : ()];
-   $self->update_items;
-}
-
-#############################################################################
-
-package CFPlus::UI::SpellList;
-
-our @ISA = CFPlus::UI::Table::;
-
-sub new {
-   my $class = shift;
-
-   my $self = $class->SUPER::new (
-      binding  => [],
-      commands => [],
-      @_,
-   )
-}
-
-my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
-
-my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
-   "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
-my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
-   "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
-my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
-   "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
-my @TOOLTIP_SP  = (align => 1, can_events => 1, can_hover => 1, tooltip =>
-   "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
-my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
-   "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
-
-sub rebuild_spell_list {
-   my ($self) = @_;
-
-   $CFPlus::UI::ROOT->on_refresh ($self => sub {
-      $self->clear;
-
-      return unless $::CONN;
-
-      $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
-      $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
-      $self->add (3, 0, new CFPlus::UI::Label text => "Lvl"  , @TOOLTIP_LVL);
-      $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
-      $self->add (5, 0, new CFPlus::UI::Label text => "Dmg"  , @TOOLTIP_DMG);
-
-      my $row = 0;
-
-      for (sort { $a cmp $b } keys %{ $self->{spell} }) {
-         my $spell = $self->{spell}{$_};
-
-         $row++;
-
-         my $spell_cb = sub {
-            my ($widget, $ev) = @_;
-
-            if ($ev->{button} == 1) {
-               $::CONN->user_send ("cast $spell->{name}");
-            } elsif ($ev->{button} == 2) {
-               $::CONN->user_send ("invoke $spell->{name}");
-            } elsif ($ev->{button} == 3) {
-               (new CFPlus::UI::Menu
-                  items => [
-                     ["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);
-            } else {
-               return 0;
-            }
-
-            1
-         };
-
-         my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
-
-         #TODO: add path info to tooltip
-         #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
-
-         $self->add (0, $row, new CFPlus::UI::Face
-            face       => $spell->{face},
-            can_hover  => 1,
-            can_events => 1,
-            tooltip    => $tooltip,
-            on_button_down => $spell_cb,
-         );
-
-         $self->add (1, $row, new CFPlus::UI::Label
-            expand     => 1,
-            text       => $spell->{name},
-            can_hover  => 1,
-            can_events => 1,
-            tooltip    => $tooltip,
-            on_button_down => $spell_cb,
-         );
-
-         $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
-         $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
-         $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
-         $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
-      }
-   });
-}
-
-sub add_spell {
-   my ($self, $spell) = @_;
-
-   $self->{spell}->{$spell->{name}} = $spell;
-   $self->rebuild_spell_list;
-}
-
-sub remove_spell {
-   my ($self, $spell) = @_;
-
-   delete $self->{spell}->{$spell->{name}};
-   $self->rebuild_spell_list;
-}
-
-sub clear_spells {
-   my ($self) = @_;
-
-   $self->{spell} = {};
-   $self->rebuild_spell_list;
-}
-
-#############################################################################
-
 package CFPlus::UI::Root;
 
 our @ISA = CFPlus::UI::Container::;
@@ -3914,7 +4081,7 @@
       @_,
    );
 
-   Scalar::Util::weaken ($self->{root} = $self);
+   CFPlus::weaken ($self->{root} = $self);
 
    $self
 }
@@ -4119,7 +4286,6 @@
          for values %{delete $self->{post_alloc_hook}};
    }
 
-
    glViewport 0, 0, $::WIDTH, $::HEIGHT;
    glClearColor +($::CFG->{fow_intensity}) x 3, 1;
    glClear GL_COLOR_BUFFER_BIT;
@@ -4135,9 +4301,9 @@
 
       local ($draw_x, $draw_y, $draw_w, $draw_h) =
          (0, 0, $self->{w}, $self->{h});
-   }
 
-   $self->_draw;
+      $self->_draw;
+   }
 }
 
 #############################################################################