--- deliantra/Deliantra-Client/DC/UI.pm	2006/07/23 04:46:02	1.331
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/12/09 02:21:25	1.361
@@ -1,4 +1,4 @@
-package CFClient::UI;
+package CFPlus::UI;
 
 use utf8;
 use strict;
@@ -7,8 +7,9 @@
 use List::Util ();
 use Event;
 
-use CFClient;
-use CFClient::Texture;
+use CFPlus;
+use CFPlus::Pod;
+use CFPlus::Texture;
 
 our ($FOCUS, $HOVER, $GRAB); # various widgets
 
@@ -98,7 +99,9 @@
    my ($ev) = @_;
    my ($x, $y) = ($ev->{x}, $ev->{y});
 
-   unless ($BUTTON_STATE) {
+   $BUTTON_STATE |= 1 << ($ev->{button} - 1);
+
+   unless ($GRAB) {
       my $widget = $ROOT->find_widget ($x, $y);
 
       $GRAB = $widget;
@@ -107,8 +110,6 @@
       $TOOLTIP_WATCHER->cb->();
    }
 
-   $BUTTON_STATE |= 1 << ($ev->{button} - 1);
-
    if ($GRAB) {
       if ($ev->{button} == 4 || $ev->{button} == 5) {
          # mousewheel
@@ -209,7 +210,7 @@
 
 #############################################################################
 
-package CFClient::UI::Event;
+package CFPlus::UI::Event;
 
 sub xy {
    $_[1]->coord2local ($_[0]{x}, $_[0]{y})
@@ -217,11 +218,11 @@
 
 #############################################################################
 
-package CFClient::UI::Base;
+package CFPlus::UI::Base;
 
 use strict;
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 sub new {
    my $class = shift;
@@ -236,7 +237,7 @@
       @_
    }, $class;
 
-   Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
+   Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
 
    for (keys %$self) {
       if (/^on_(.*)$/) {
@@ -244,11 +245,11 @@
       }
    }
 
-   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};
+   if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
+      $self->{x}       = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
+      $self->{y}       = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
+      $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
+      $self->{force_h} = $layout->{h} * $CFPlus::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};
@@ -263,6 +264,7 @@
    my ($self) = @_;
 
    $self->hide;
+   $self->emit ("destroy");
    %$self = ();
 }
 
@@ -271,7 +273,7 @@
 
    return if $self->{parent};
 
-   $CFClient::UI::ROOT->add ($self);
+   $CFPlus::UI::ROOT->add ($self);
 }
 
 sub set_visible {
@@ -302,7 +304,7 @@
    undef $GRAB  if $GRAB  == $self;
    undef $HOVER if $HOVER == $self;
 
-   $CFClient::UI::TOOLTIP_WATCHER->cb->()
+   $CFPlus::UI::TOOLTIP_WATCHER->cb->()
       if $TOOLTIP->{owner} == $self;
 
    $self->emit ("focus_out");
@@ -369,8 +371,8 @@
    if ($self->{aspect}) {
       my ($ow, $oh) = ($w, $h);
 
-      $w = List::Util::min $w, int $h * $self->{aspect};
-      $h = List::Util::min $h, int $w / $self->{aspect};
+      $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
+      $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
 
       # use alignment to adjust x, y
 
@@ -421,9 +423,9 @@
 
    $self->{tooltip} = $tooltip;
 
-   if ($CFClient::UI::TOOLTIP->{owner} == $self) {
-      delete $CFClient::UI::TOOLTIP->{owner};
-      $CFClient::UI::TOOLTIP_WATCHER->cb->();
+   if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
+      delete $CFPlus::UI::TOOLTIP->{owner};
+      $CFPlus::UI::TOOLTIP_WATCHER->cb->();
    }
 }
 
@@ -440,6 +442,8 @@
 sub coord2global {
    my ($self, $x, $y) = @_;
 
+   Carp::confess unless $self->{parent};#d#
+
    $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
 }
 
@@ -496,6 +500,17 @@
    my ($self, $signal, $cb) = @_;
 
    push @{ $self->{signal_cb}{$signal} }, $cb;
+
+   defined wantarray and CFPlus::guard {
+      @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
+         @{ $self->{signal_cb}{$signal} };
+   }
+}
+
+sub disconnect_all {
+   my ($self, $signal) = @_;
+
+   delete $self->{signal_cb}{$signal};
 }
 
 my %has_coords = (
@@ -508,6 +523,8 @@
 sub emit {
    my ($self, $signal, @args) = @_;
 
+   # 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)
@@ -612,7 +629,7 @@
       glVertex 0             , $self->{h} - 1;
       glEnd;
       glPopMatrix;
-      #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
+      #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
    }
 
    $self->_draw;
@@ -628,22 +645,22 @@
 sub DESTROY {
    my ($self) = @_;
 
-   return if CFClient::in_destruct;
-
-   delete $WIDGET{$self+0};
+   return if CFPlus::in_destruct;
 
    eval { $self->destroy };
    warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
+
+   delete $WIDGET{$self+0};
 }
 
 #############################################################################
 
-package CFClient::UI::DrawBG;
+package CFPlus::UI::DrawBG;
 
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
 
 use strict;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 sub new {
    my $class = shift;
@@ -684,9 +701,9 @@
 
 #############################################################################
 
-package CFClient::UI::Empty;
+package CFPlus::UI::Empty;
 
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
 
 sub new {
    my ($class, %arg) = @_;
@@ -703,9 +720,9 @@
 
 #############################################################################
 
-package CFClient::UI::Container;
+package CFPlus::UI::Container;
 
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
 
 sub new {
    my ($class, %arg) = @_;
@@ -724,6 +741,14 @@
    $self
 }
 
+sub realloc {
+   my ($self) = @_;
+
+   $self->{force_realloc} = 1;
+   $self->{force_size_alloc} = 1;
+   $self->SUPER::realloc;
+}
+
 sub add {
    my ($self, @widgets) = @_;
 
@@ -793,14 +818,14 @@
 
 #############################################################################
 
-package CFClient::UI::Bin;
+package CFPlus::UI::Bin;
 
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
 
 sub new {
    my ($class, %arg) = @_;
 
-   my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
+   my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
 
    $class->SUPER::new (children => [$child], %arg)
 }
@@ -817,7 +842,7 @@
 
    $self->SUPER::remove ($widget);
 
-   $self->{children} = [new CFClient::UI::Empty]
+   $self->{children} = [new CFPlus::UI::Empty]
       unless @{$self->{children}};
 }
 
@@ -839,11 +864,11 @@
 
 # back-buffered drawing area
 
-package CFClient::UI::Window;
+package CFPlus::UI::Window;
 
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 sub new {
    my ($class, %arg) = @_;
@@ -875,26 +900,24 @@
 sub render_child {
    my ($self) = @_;
 
-   $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
+   $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
       glClearColor 0, 0, 0, 0;
       glClear GL_COLOR_BUFFER_BIT;
 
       {
-         package CFClient::UI::Base;
+         package CFPlus::UI::Base;
 
-         ($draw_x, $draw_y, $draw_w, $draw_h) =
+         local ($draw_x, $draw_y, $draw_w, $draw_h) =
             (0, 0, $self->{w}, $self->{h});
-      }
 
-      $self->_render;
+         $self->_render;
+      }
    };
 }
 
 sub _draw {
    my ($self) = @_;
 
-   my ($w, $h) = @$self{qw(w h)};
-
    my $tex = $self->{texture}
       or return;
 
@@ -902,16 +925,16 @@
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
    glColor 0, 0, 0, 1;
 
-   $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
+   $tex->draw_quad_alpha_premultiplied (0, 0);
 
    glDisable GL_TEXTURE_2D;
 }
 
 #############################################################################
 
-package CFClient::UI::ViewPort;
+package CFPlus::UI::ViewPort;
 
-our @ISA = CFClient::UI::Window::;
+our @ISA = CFPlus::UI::Window::;
 
 sub new {
    my $class = shift;
@@ -981,26 +1004,26 @@
    ) {
        $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
    } else {
-      $self->CFClient::UI::Base::find_widget ($x, $y)
+      $self->CFPlus::UI::Base::find_widget ($x, $y)
    }
 }
 
 sub _render {
    my ($self) = @_;
 
-   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};
+   local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
+   local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
 
-   CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
+   CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
 
    $self->SUPER::_render;
 }
 
 #############################################################################
 
-package CFClient::UI::ScrolledWindow;
+package CFPlus::UI::ScrolledWindow;
 
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::HBox::;
 
 sub new {
    my ($class, %arg) = @_;
@@ -1009,7 +1032,7 @@
 
    my $self;
 
-   my $slider = new CFClient::UI::Slider
+   my $slider = new CFPlus::UI::Slider
       vertical   => 1,
       range      => [0, 0, 1, 0.01], # HACK fix
       on_changed => sub {
@@ -1018,7 +1041,7 @@
    ;
 
    $self = $class->SUPER::new (
-      vp         => (new CFClient::UI::ViewPort expand => 1),
+      vp         => (new CFPlus::UI::ViewPort expand => 1),
       can_events => 1,
       slider     => $slider,
       %arg,
@@ -1072,11 +1095,11 @@
 
 #############################################################################
 
-package CFClient::UI::Frame;
+package CFPlus::UI::Frame;
 
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 sub new {
    my $class = shift;
@@ -1112,18 +1135,118 @@
 
 #############################################################################
 
-package CFClient::UI::FancyFrame;
+package CFPlus::UI::FancyFrame;
+
+our @ISA = CFPlus::UI::Bin::;
+
+use CFPlus::OpenGL;
+
+sub new {
+   my ($class, %arg) = @_;
+
+   if ((exists $arg{label}) && !ref $arg{label}) {
+      $arg{label} = new CFPlus::UI::Label
+         align    => 1,
+         valign   => 0,
+         text     => $arg{label},
+         fontsize => ($arg{border} || 0.8) * 0.75;
+   }
+
+   my $self = $class->SUPER::new (
+      # label     => "",
+      fg          => [0.6, 0.3, 0.1],
+      border      => 0.8,
+      style       => 'single',
+      %arg,
+   );
 
-our @ISA = CFClient::UI::Bin::;
+   $self
+}
 
-use CFClient::OpenGL;
+sub add {
+   my ($self, @widgets) = @_;
+
+   $self->SUPER::add (@widgets);
+   $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
+}
+
+sub border {
+   int $_[0]{border} * $::FONTSIZE
+}
+
+sub size_request {
+   my ($self) = @_;
+
+   ($self->{label_w}, undef) = $self->{label}->size_request
+      if $self->{label};
+
+   my ($w, $h) = $self->SUPER::size_request;
+
+   (
+      $w + $self->border * 2,
+      $h + $self->border * 2,
+   )
+}
+
+sub invoke_size_allocate {
+   my ($self, $w, $h) = @_;
+
+   my $border = $self->border;
+
+   $w -= List::Util::max 0, $border * 2;
+   $h -= List::Util::max 0, $border * 2;
+
+   if (my $label = $self->{label}) {
+      $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
+      $label->{h} = List::Util::min $h, $border;
+      $label->invoke_size_allocate ($label->{w}, $label->{h});
+   }
+
+   $self->child->configure ($border, $border, $w, $h);
+
+   1
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   my $child = $self->{children}[0];
+
+   my $border = $self->border;
+   my ($w, $h) = ($self->{w}, $self->{h});
+
+   $child->draw;
+
+   glColor @{$self->{fg}};
+   glBegin GL_LINE_STRIP;
+   glVertex $border * 1.5      , $border * 0.5 + 0.5;
+   glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
+   glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
+   glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
+   glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
+   glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
+   glEnd;
+
+   if ($self->{label}) {
+      glTranslate $border * 2, 0;
+      $self->{label}->_draw;
+   }
+}
+
+#############################################################################
+
+package CFPlus::UI::Toplevel;
+
+our @ISA = CFPlus::UI::Bin::;
+
+use CFPlus::OpenGL;
 
 my $bg = 
-      new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
+      new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
          mipmap => 1, wrap => 1;
 
 my @border = 
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+      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);
 
 sub new {
@@ -1139,7 +1262,7 @@
       %arg,
    );
 
-   $self->{title_widget} = new CFClient::UI::Label
+   $self->{title_widget} = new CFPlus::UI::Label
       align    => 0,
       valign   => 1,
       text     => $self->{title},
@@ -1148,11 +1271,11 @@
 
    if ($self->{has_close_button}) {
       $self->{close_button} =
-         new CFClient::UI::ImageButton
+         new CFPlus::UI::ImageButton
             path        => 'x1_close.png',
             on_activate => sub { $self->emit ("delete") };
 
-      $self->CFClient::UI::Container::add ($self->{close_button});
+      $self->CFPlus::UI::Container::add ($self->{close_button});
    }
 
    $self
@@ -1162,8 +1285,8 @@
    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};
+   $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
+   $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
 }
 
 sub border {
@@ -1281,6 +1404,14 @@
    ! ! $self->{motion}
 }
 
+sub invoke_visibility_change {
+   my ($self, $visible) = @_;
+
+   delete $self->{motion} unless $visible;
+
+   0
+}
+
 sub _draw {
    my ($self) = @_;
 
@@ -1327,13 +1458,13 @@
 
 #############################################################################
 
-package CFClient::UI::Table;
+package CFPlus::UI::Table;
 
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
 
 use List::Util qw(max sum);
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 sub new {
    my $class = shift;
@@ -1349,11 +1480,16 @@
 }
 
 sub add {
-   my ($self, $x, $y, $child) = @_;
+   my ($self) = shift;
 
-   $child->set_parent ($self);
-   $self->{children}[$y][$x] = $child;
+   while (@_) {
+      my ($x, $y, $child) = splice @_, 0, 3, ();
+      $child->set_parent ($self);
+      $self->{children}[$y][$x] = $child;
+   }
 
+   $self->{force_realloc} = 1;
+   $self->{force_size_alloc} = 1;
    $self->realloc;
 }
 
@@ -1428,8 +1564,8 @@
    $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
    $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
 
-   CFClient::UI::harmonize $ws;
-   CFClient::UI::harmonize $hs;
+   CFPlus::UI::harmonize $ws;
+   CFPlus::UI::harmonize $hs;
 
    my $y;
 
@@ -1482,9 +1618,9 @@
 
 #############################################################################
 
-package CFClient::UI::Box;
+package CFPlus::UI::Box;
 
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
 
 sub size_request {
    my ($self) = @_;
@@ -1527,7 +1663,7 @@
       }
    }
 
-   CFClient::UI::harmonize \@req;
+   CFPlus::UI::harmonize \@req;
 
    my $pos = 0;
    for (0 .. $#children) {
@@ -1542,9 +1678,9 @@
 
 #############################################################################
 
-package CFClient::UI::HBox;
+package CFPlus::UI::HBox;
 
-our @ISA = CFClient::UI::Box::;
+our @ISA = CFPlus::UI::Box::;
 
 sub new {
    my $class = shift;
@@ -1557,9 +1693,9 @@
 
 #############################################################################
 
-package CFClient::UI::VBox;
+package CFPlus::UI::VBox;
 
-our @ISA = CFClient::UI::Box::;
+our @ISA = CFPlus::UI::Box::;
 
 sub new {
    my $class = shift;
@@ -1572,11 +1708,11 @@
 
 #############################################################################
 
-package CFClient::UI::Label;
+package CFPlus::UI::Label;
 
-our @ISA = CFClient::UI::DrawBG::;
+our @ISA = CFPlus::UI::DrawBG::;
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 sub new {
    my ($class, %arg) = @_;
@@ -1589,8 +1725,9 @@
       #text      => initial text
       #markup    => initial narkup
       #max_w     => maximum pixel width
+      #style     => 0, # render flags
       ellipsise  => 3, # end
-      layout     => (new CFClient::Layout),
+      layout     => (new CFPlus::Layout),
       fontsize   => 1,
       align      => -1,
       valign     => -1,
@@ -1601,7 +1738,7 @@
    );
 
    if (exists $self->{template}) {
-      my $layout = new CFClient::Layout;
+      my $layout = new CFPlus::Layout;
       $layout->set_text (delete $self->{template});
       $self->{template} = $layout;
    }
@@ -1615,16 +1752,6 @@
    $self
 }
 
-sub escape($) {
-   local $_ = $_[0];
-
-   s/&/&amp;/g;
-   s/>/&gt;/g;
-   s/</&lt;/g;
-
-   $_
-}
-
 sub update {
    my ($self) = @_;
 
@@ -1759,16 +1886,16 @@
    my $w = List::Util::min $self->{w} + 4, $size->[0];
    my $h = List::Util::min $self->{h} + 2, $size->[1];
 
-   $self->{layout}->render ($self->{ox}, $self->{oy});
+   $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
 }
 
 #############################################################################
 
-package CFClient::UI::EntryBase;
+package CFPlus::UI::EntryBase;
 
-our @ISA = CFClient::UI::Label::;
+our @ISA = CFPlus::UI::Label::;
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 sub new {
    my $class = shift;
@@ -1782,6 +1909,7 @@
       can_focus  => 1,
       valign     => 0,
       can_events => 1,
+      ellipsise  => 0,
       #text      => ...
       #hidden    => "*",
       @_
@@ -1840,17 +1968,20 @@
       substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
    } elsif ($uni == 127) {
       substr $text, $self->{cursor}, 1, "";
-   } elsif ($sym == CFClient::SDLK_LEFT) {
+   } elsif ($sym == CFPlus::SDLK_LEFT) {
       --$self->{cursor} if $self->{cursor};
-   } elsif ($sym == CFClient::SDLK_RIGHT) {
+   } elsif ($sym == CFPlus::SDLK_RIGHT) {
       ++$self->{cursor} if $self->{cursor} < length $self->{text};
-   } elsif ($sym == CFClient::SDLK_HOME) {
+   } elsif ($sym == CFPlus::SDLK_HOME) {
       $self->{cursor} = 0;
-   } elsif ($sym == CFClient::SDLK_END) {
+   } elsif ($sym == CFPlus::SDLK_END) {
       $self->{cursor} = length $text;
+   } elsif ($uni == 21) { # ctrl-u
+      $text = "";
+      $self->{cursor} = 0;
    } elsif ($uni == 27) {
       $self->emit ('escape');
-   } elsif ($uni) {
+   } elsif ($uni >= 0x20 || $uni == 0x0d) {
       substr $text, $self->{cursor}++, 0, chr $uni;
    } else {
       return 0;
@@ -1859,6 +1990,7 @@
    $self->_set_text ($text);
 
    $self->realloc;
+   $self->update;
 
    1
 }
@@ -1930,26 +2062,27 @@
          @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
       }
 
-      glColor @{$self->{fg}};
       glBegin GL_LINES;
-      glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
-      glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
+      glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
+      glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
       glEnd;
    }
 }
 
-package CFClient::UI::Entry;
+#############################################################################
+
+package CFPlus::UI::Entry;
 
-our @ISA = CFClient::UI::EntryBase::;
+our @ISA = CFPlus::UI::EntryBase::;
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 sub invoke_key_down {
    my ($self, $ev) = @_;
 
    my $sym = $ev->{sym};
 
-   if ($sym == 13) {
+   if ($ev->{uni} == 0x0d || $sym == 13) {
       unshift @{$self->{history}},
          my $txt = $self->get_text;
 
@@ -1958,7 +2091,7 @@
       $self->emit (activate => $txt);
       $self->update;
 
-   } elsif ($sym == CFClient::SDLK_UP) {
+   } elsif ($sym == CFPlus::SDLK_UP) {
       if ($self->{history_pointer} < 0) {
          $self->{history_saveback} = $self->get_text;
       }
@@ -1970,7 +2103,7 @@
          $self->set_text ($self->{history}->[$self->{history_pointer}]);
       }
 
-   } elsif ($sym == CFClient::SDLK_DOWN) {
+   } elsif ($sym == CFPlus::SDLK_DOWN) {
       $self->{history_pointer}--;
       $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
 
@@ -1989,14 +2122,53 @@
 
 #############################################################################
 
-package CFClient::UI::Button;
+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 = CFClient::UI::Label::;
+our @ISA = CFPlus::UI::Label::;
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 my @tex =
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
          qw(b1_button_active.png);
 
 sub new {
@@ -2043,51 +2215,15 @@
 
 #############################################################################
 
-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;
+package CFPlus::UI::CheckBox;
 
-our @ISA = CFClient::UI::DrawBG::;
+our @ISA = CFPlus::UI::DrawBG::;
 
 my @tex =
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
          qw(c1_checkbox_bg.png c1_checkbox_active.png);
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 sub new {
    my $class = shift;
@@ -2154,11 +2290,11 @@
 
 #############################################################################
 
-package CFClient::UI::Image;
+package CFPlus::UI::Image;
 
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 our %texture_cache;
 
@@ -2174,7 +2310,7 @@
       or Carp::croak "'path' or 'tex' attributes required";
 
    $self->{tex} ||= $texture_cache{$self->{path}} ||=
-      new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
+      new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
 
    Scalar::Util::weaken $texture_cache{$self->{path}};
 
@@ -2183,6 +2319,21 @@
    $self
 }
 
+sub STORABLE_freeze {
+   my ($self, $cloning) = @_;
+
+   $self->{path}
+      or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
+
+   $self->{path}
+}
+
+sub STORABLE_attach {
+   my ($self, $cloning, $path) = @_;
+
+   $self->new (path => $path)
+}
+
 sub size_request {
    my ($self) = @_;
 
@@ -2206,36 +2357,72 @@
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
-   $tex->draw_quad_alpha (0, 0, $w, $h);
+   $tex->draw_quad (0, 0, $w, $h);
 
    glDisable GL_TEXTURE_2D;
 }
 
 #############################################################################
 
-package CFClient::UI::VGauge;
+package CFPlus::UI::ImageButton;
+
+our @ISA = CFPlus::UI::Image::;
+
+use CFPlus::OpenGL;
 
-our @ISA = CFClient::UI::Base::;
+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 CFPlus::UI::VGauge;
+
+our @ISA = CFPlus::UI::Base::;
 
 use List::Util qw(min max);
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 my %tex = (
    food => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
          qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
    ],
    grace => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
          qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
    ],
    hp => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
          qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
    ],
    mana => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
          qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
    ],
 );
@@ -2348,9 +2535,9 @@
 
 #############################################################################
 
-package CFClient::UI::Gauge;
+package CFPlus::UI::Gauge;
 
-our @ISA = CFClient::UI::VBox::;
+our @ISA = CFPlus::UI::VBox::;
 
 sub new {
    my ($class, %arg) = @_;
@@ -2362,9 +2549,9 @@
       %arg,
    );
 
-   $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
-   $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
-   $self->add ($self->{max}   = new CFClient::UI::Label valign => -1, align => 0, template => "999");
+   $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
+   $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
+   $self->add ($self->{max}   = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
 
    $self
 }
@@ -2395,16 +2582,16 @@
 
 #############################################################################
 
-package CFClient::UI::Slider;
+package CFPlus::UI::Slider;
 
 use strict;
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
-our @ISA = CFClient::UI::DrawBG::;
+our @ISA = CFPlus::UI::DrawBG::;
 
 my @tex =
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
          qw(s1_slider.png s1_slider_bg.png);
 
 sub new {
@@ -2508,7 +2695,7 @@
 
    my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
 
-   $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
+   $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
 
    ! ! $delta
 }
@@ -2569,9 +2756,9 @@
 
 #############################################################################
 
-package CFClient::UI::ValSlider;
+package CFPlus::UI::ValSlider;
 
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::HBox::;
 
 sub new {
    my ($class, %arg) = @_;
@@ -2579,8 +2766,8 @@
    my $range = delete $arg{range};
 
    my $self = $class->SUPER::new (
-      slider     => (new CFClient::UI::Slider expand => 1, range => $range),
-      entry      => (new CFClient::UI::Label text => "", template => delete $arg{template}),
+      slider     => (new CFPlus::UI::Slider expand => 1, range => $range),
+      entry      => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
       to_value   => sub { shift },
       from_value => sub { shift },
       %arg,
@@ -2610,11 +2797,11 @@
 
 #############################################################################
 
-package CFClient::UI::TextScroller;
+package CFPlus::UI::TextScroller;
 
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::HBox::;
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 sub new {
    my $class = shift;
@@ -2626,12 +2813,12 @@
       #font      => default_font
       @_,
                  
-      layout     => (new CFClient::Layout),
+      layout     => (new CFPlus::Layout),
       par        => [],
       height     => 0,
       children   => [
-         (new CFClient::UI::Empty expand => 1),
-         (new CFClient::UI::Slider vertical => 1),
+         (new CFPlus::UI::Empty expand => 1),
+         (new CFPlus::UI::Slider vertical => 1),
       ],
    );
 
@@ -2718,6 +2905,21 @@
    $self->{children}[1]->set_value ($offset);
 }
 
+sub current_paragraph {
+   my ($self) = @_;
+
+   $self->{top_paragraph} - 1
+}
+
+sub scroll_to {
+   my ($self, $para) = @_;
+
+   $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
+
+   $self->{scroll_to} = $para;
+   $self->update;
+}
+
 sub clear {
    my ($self) = @_;
 
@@ -2730,21 +2932,22 @@
 }
 
 sub add_paragraph {
-   my ($self, $color, $para, $indent) = @_;
-
-   my ($text, @w) = ref $para ? @$para : $para;
+   my $self = shift;
 
-   $para = {
-      w       => 1e10,
-      wrapped => 1,
-      fg      => $color,
-      indent  => $indent,
-      markup  => $text,
-      widget  => \@w,
-   };
+   for my $para (@_) {
+      $para = {
+         fg      => [1, 1, 1, 1],
+         indent  => 0,
+         markup  => "",
+         widget  => [],
+         ref $para ? %$para : (markup => $para),
+         w       => 1e10,
+         wrapped => 1,
+      };
 
-   $self->add (@w) if @w;
-   push @{$self->{par}}, $para;
+      $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
+      push @{$self->{par}}, $para;
+   }
 
    $self->{need_reflow}++;
    $self->update;
@@ -2753,65 +2956,79 @@
 sub scroll_to_bottom {
    my ($self) = @_;
 
-   $self->{scroll_to_bottom} = 1;
+   $self->{scroll_to} = $#{$self->{par}};
    $self->update;
 }
 
-sub update {
+sub force_uptodate {
    my ($self) = @_;
 
-   $self->SUPER::update;
+   if (delete $self->{need_reflow}) {
+      my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
 
-   return unless $self->{h} > 0;
+      my $height = 0;
 
-   delete $self->{texture};
+      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;
+
+            $para->{w}       = $w + $para->{indent};
+            $para->{h}       = $h;
+            $para->{wrapped} = $layout->has_wrapped;
+         }
 
-   $ROOT->on_post_alloc ($self => sub {
-      my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
+         $para->{y} = $height;
+         $height += $para->{h};
+      }
 
-      if (delete $self->{need_reflow}) {
-         my $height = 0;
+      $self->{height} = $height;
+      $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
 
-         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;
+      delete $self->{texture};
+   }
 
-               $para->{w}       = $w + $para->{indent};
-               $para->{h}       = $h;
-               $para->{wrapped} = $layout->has_wrapped;
-            }
+   if (my $paridx = delete $self->{scroll_to}) {
+      $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
+   }
+}
 
-            $height += $para->{h};
-         }
+sub update {
+   my ($self) = @_;
 
-         $self->{height} = $height;
+   $self->SUPER::update;
 
-         $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
+   return unless $self->{h} > 0;
 
-         delete $self->{texture};
-      }
+   delete $self->{texture};
 
-      if (delete $self->{scroll_to_bottom}) {
-         $self->{children}[1]->set_value (1e10);
-      }
+   $ROOT->on_post_alloc ($self => sub {
+      $self->force_uptodate;
+
+      my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
 
-      $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
+      $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
          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});
+
+         my $top = int $self->{children}[1]{range}[0];
+
+         my $paridx = 0;
+         my $top_paragraph;
          my $top = int $self->{children}[1]{range}[0];
 
          my $y0 = $top;
          my $y1 = $top + $H;
 
-         my $y = 0;
-
          for my $para (@{$self->{par}}) {
             my $h = $para->{h};
+            my $y = $para->{y};
 
             if ($y0 < $y + $h && $y < $y1) {
-
                my $layout = $self->get_layout ($para);
 
                $layout->render ($para->{indent}, $y - $y0);
@@ -2830,8 +3047,11 @@
                }
             }
 
-            $y += $h;
+            $paridx++;
+            $top_paragraph ||= $paridx if $y >= $top;
          }
+
+         $self->{top_paragraph} = $top_paragraph;
       };
    });
 }
@@ -2859,11 +3079,11 @@
 
 #############################################################################
 
-package CFClient::UI::Animator;
+package CFPlus::UI::Animator;
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
 
 sub moveto {
    my ($self, $x, $y) = @_;
@@ -2901,9 +3121,9 @@
 
 #############################################################################
 
-package CFClient::UI::Flopper;
+package CFPlus::UI::Flopper;
 
-our @ISA = CFClient::UI::Button::;
+our @ISA = CFPlus::UI::Button::;
 
 sub new {
    my $class = shift;
@@ -2925,11 +3145,11 @@
 
 #############################################################################
 
-package CFClient::UI::Tooltip;
+package CFPlus::UI::Tooltip;
 
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 sub new {
    my $class = shift;
@@ -2943,6 +3163,9 @@
 sub set_tooltip_from {
    my ($self, $widget) = @_;
 
+   $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
+      if $widget->{tooltip} =~ /^#(.*)$/;
+
    my $tooltip = $widget->{tooltip};
 
    if ($ENV{CFPLUS_DEBUG} & 2) {
@@ -2955,11 +3178,11 @@
    $tooltip =~ s/^\n+//;
    $tooltip =~ s/\n+$//;
 
-   $self->add (new CFClient::UI::Label
+   $self->add (new CFPlus::UI::Label
       markup    => $tooltip,
       max_w     => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
       fontsize  => 0.8,
-      fg        => [0, 0, 0, 1],
+      style     => 1, # FLAG_INVERSE
       ellipsise => 0,
       font      => ($widget->{tooltip_font} || $::FONT_PROP),
    );
@@ -2988,12 +3211,16 @@
       my $widget = $self->{owner}
          or return;
 
-      my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
+      if ($widget->{visible}) {
+         my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
 
-      ($x, $y) = $widget->coord2global (-$self->{w}, 0)
-         if $x + $self->{w} > $self->{root}{w};
+         ($x, $y) = $widget->coord2global (-$self->{w}, 0)
+            if $x + $self->{w} > $self->{root}{w};
 
-      $self->move_abs ($x, $y);
+         $self->move_abs ($x, $y);
+      } else {
+         $self->hide;
+      }
    });
 }
 
@@ -3027,11 +3254,11 @@
 
 #############################################################################
 
-package CFClient::UI::Face;
+package CFPlus::UI::Face;
 
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::DrawBG::;
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 sub new {
    my $class = shift;
@@ -3076,6 +3303,8 @@
 
    return unless $::CONN;
 
+   $self->SUPER::_draw;
+
    my $face;
 
    if ($self->{frame}) {
@@ -3107,19 +3336,19 @@
 
 #############################################################################
 
-package CFClient::UI::Buttonbar;
+package CFPlus::UI::Buttonbar;
 
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::HBox::;
 
-# TODO: should actualyl wrap buttons and other goodies.
+# TODO: should actually wrap buttons and other goodies.
 
 #############################################################################
 
-package CFClient::UI::Menu;
+package CFPlus::UI::Menu;
 
-our @ISA = CFClient::UI::FancyFrame::;
+our @ISA = CFPlus::UI::Toplevel::;
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 sub new {
    my $class = shift;
@@ -3130,7 +3359,7 @@
       @_,
    );
 
-   $self->add ($self->{vbox} = new CFClient::UI::VBox);
+   $self->add ($self->{vbox} = new CFPlus::UI::VBox);
 
    for my $item (@{ $self->{items} }) {
       my ($widget, $cb, $tooltip) = @$item;
@@ -3140,18 +3369,18 @@
          if ($widget =~ /\t/) {
             my ($left, $right) = split /\t/, $widget, 2;
 
-            $widget = new CFClient::UI::HBox
+            $widget = new CFPlus::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),
+                  (new CFPlus::UI::Label markup => $left, expand => 1),
+                  (new CFPlus::UI::Label markup => $right, align => +1),
                ],
             ;
                
          } else {
-            $widget = new CFClient::UI::Label
+            $widget = new CFPlus::UI::Label
                can_hover  => 1,
                can_events => 1,
                markup     => $widget,
@@ -3209,9 +3438,9 @@
 
 #############################################################################
 
-package CFClient::UI::Multiplexer;
+package CFPlus::UI::Multiplexer;
 
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
 
 sub new {
    my $class = shift;
@@ -3282,16 +3511,16 @@
 
 #############################################################################
 
-package CFClient::UI::Notebook;
+package CFPlus::UI::Notebook;
 
-our @ISA = CFClient::UI::VBox::;
+our @ISA = CFPlus::UI::VBox::;
 
 sub new {
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      buttonbar   => (new CFClient::UI::Buttonbar),
-      multiplexer => (new CFClient::UI::Multiplexer expand => 1),
+      buttonbar   => (new CFPlus::UI::Buttonbar),
+      multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
       # filter => # will be put between multiplexer and $self
       @_,
    );
@@ -3307,7 +3536,7 @@
 
    Scalar::Util::weaken $self;
 
-   $self->{buttonbar}->add (new CFClient::UI::Button
+   $self->{buttonbar}->add (new CFPlus::UI::Button
       markup      => $title,
       tooltip     => $tooltip,
       on_activate => sub { $self->set_current_page ($widget) },
@@ -3331,11 +3560,11 @@
 
 #############################################################################
 
-package CFClient::UI::Combobox;
+package CFPlus::UI::Selector;
 
 use utf8;
 
-our @ISA = CFClient::UI::Button::;
+our @ISA = CFPlus::UI::Button::;
 
 sub new {
    my $class = shift;
@@ -3362,7 +3591,7 @@
       push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
    }
 
-   CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
+   CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
 }
 
 sub _set_value {
@@ -3387,9 +3616,9 @@
 
 #############################################################################
 
-package CFClient::UI::Statusbox;
+package CFPlus::UI::Statusbox;
 
-our @ISA = CFClient::UI::VBox::;
+our @ISA = CFPlus::UI::VBox::;
 
 sub new {
    my $class = shift;
@@ -3411,8 +3640,8 @@
    my $NOW = Time::HiRes::time;
 
    # freeze display when hovering over any label
-   return if $CFClient::UI::TOOLTIP->{owner}
-             && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
+   return if $CFPlus::UI::TOOLTIP->{owner}
+             && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
                    values %{ $self->{item} };
 
    while (my ($k, $v) = each %{ $self->{item} }) {
@@ -3443,7 +3672,7 @@
             s/\s+/ /g;
          }
 
-         new CFClient::UI::Label
+         new CFPlus::UI::Label
             markup        => $short,
             tooltip       => $item->{tooltip},
             tooltip_font  => $::FONT_PROP,
@@ -3532,177 +3761,13 @@
 
 #############################################################################
 
-package CFClient::UI::Inventory;
-
-our @ISA = CFClient::UI::Table::;
-
-sub new {
-   my $class = shift;
-
-   my $self = $class->SUPER::new (
-      col_expand => [0, 1, 0],
-      @_,
-   );
-
-   $self
-}
-
-sub set_items {
-   my ($self, $items) = @_;
-
-   $self->clear;
-   return unless $items;
-
-   my @items = sort {
-      ($a->{type} <=> $b->{type})
-         or ($a->{name} cmp $b->{name})
-   } values %$items;
-
-   $self->{real_items} = \@items;
-
-   my $row = 0;
-   for my $item (@items) {
-      CFClient::Item::update_widgets $item;
-
-      $self->add (0, $row, $item->{face_widget});
-      $self->add (1, $row, $item->{desc_widget});
-      $self->add (2, $row, $item->{weight_widget});
-
-      $row++;
-   }
-}
-
-#############################################################################
-
-package CFClient::UI::SpellList;
-
-our @ISA = CFClient::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) = @_;
-
-   $CFClient::UI::ROOT->on_refresh ($self => sub {
-      $self->clear;
-
-      return unless $::CONN;
-
-      $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
-      $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
-      $self->add (3, 0, new CFClient::UI::Label text => "Lvl"  , @TOOLTIP_LVL);
-      $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
-      $self->add (5, 0, new CFClient::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 CFClient::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 = "$spell->{message}$TOOLTIP_ALL";
-
-         #TODO: add path info to tooltip
-         #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
-
-         $self->add (0, $row, new CFClient::UI::Face
-            face       => $spell->{face},
-            can_hover  => 1,
-            can_events => 1,
-            tooltip    => $tooltip,
-            on_button_down => $spell_cb,
-         );
-
-         $self->add (1, $row, new CFClient::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 CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
-         $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
-         $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
-         $self->add (5, $row, new CFClient::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 CFClient::UI::Root;
+package CFPlus::UI::Root;
 
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
 
 use List::Util qw(min max);
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 sub new {
    my $class = shift;
@@ -3891,6 +3956,9 @@
          $w = max $widget->{min_w}, $w;
          $h = max $widget->{min_h}, $h;
 
+#         $w = min $self->{w} - $widget->{x}, $w if $self->{w};
+#         $h = min $self->{h} - $widget->{y}, $h if $self->{h};
+
          $w = min $widget->{max_w}, $w if exists $widget->{max_w};
          $h = min $widget->{max_h}, $h if exists $widget->{max_h};
 
@@ -3926,21 +3994,21 @@
    glLoadIdentity;
 
    {
-      package CFClient::UI::Base;
+      package CFPlus::UI::Base;
 
-      ($draw_x, $draw_y, $draw_w, $draw_h) =
+      local ($draw_x, $draw_y, $draw_w, $draw_h) =
          (0, 0, $self->{w}, $self->{h});
-   }
 
-   $self->_draw;
+      $self->_draw;
+   }
 }
 
 #############################################################################
 
-package CFClient::UI;
+package CFPlus::UI;
 
-$ROOT = new CFClient::UI::Root;
-$TOOLTIP = new CFClient::UI::Tooltip z => 900;
+$ROOT = new CFPlus::UI::Root;
+$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
 
 1