--- deliantra/Deliantra-Client/DC/UI.pm	2006/05/28 23:21:28	1.252
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/06/03 22:50:48	1.275
@@ -19,29 +19,37 @@
 our %WIDGET; # all widgets, weak-referenced
 
 sub get_layout {
+   my $layout;
+
    for (grep { $_->{name} } values %WIDGET) {
-      $LAYOUT->{$_->{name}} = {
-         x => $_->{x} / $::WIDTH,
-         y => $_->{y} / $::HEIGHT,
-         w => $_->{w} / $::WIDTH,
-         h => $_->{h} / $::HEIGHT
-      };
+      my $win = $layout->{$_->{name}} = { };
+      
+      $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH   if $_->{x} =~ /^[0-9.]+$/;
+      $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT  if $_->{y} =~ /^[0-9.]+$/;
+      $win->{w} = $_->{w} / $::WIDTH                     if defined $_->{w};
+      $win->{h} = $_->{h} / $::HEIGHT                    if defined $_->{h};
+
+      $win->{show} = $_->{visible} && $_->{is_toplevel};
    }
 
-   return $LAYOUT;
+   $layout
 }
 
 sub set_layout {
    my ($layout) = @_;
+
    $LAYOUT = $layout;
 }
 
 sub check_tooltip {
+   return if $ENV{CFPLUS_DEBUG} & 8;
+
    if (!$GRAB) {
       for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
          if (length $widget->{tooltip}) {
-
             if ($TOOLTIP->{owner} != $widget) {
+               $TOOLTIP->hide;
+
                $TOOLTIP->{owner} = $widget;
 
                my $tip = $widget->{tooltip};
@@ -49,13 +57,6 @@
                $tip = $tip->($widget) if CODE:: eq ref $tip;
                
                $TOOLTIP->set_tooltip_from ($widget);
-
-               my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
-
-               ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
-                  if $x + $TOOLTIP->{w} > $::WIDTH;
-
-               $TOOLTIP->move ($x, $y);
                $TOOLTIP->show;
             }
 
@@ -172,12 +173,19 @@
 
    for my $widget (values %WIDGET) {
       if ($widget->{is_toplevel}) {
-         $widget->{x}      = int 0.5 + $widget->{x}      * $sx if exists $widget->{x};
-         $widget->{w}      = int 0.5 + $widget->{w}      * $sx if exists $widget->{w};
-         $widget->{req_w}  = int 0.5 + $widget->{req_w}  * $sx if exists $widget->{req_w};
-         $widget->{y}      = int 0.5 + $widget->{y}      * $sy if exists $widget->{y};
-         $widget->{h}      = int 0.5 + $widget->{h}      * $sy if exists $widget->{h};
-         $widget->{req_h}  = int 0.5 + $widget->{req_h}  * $sy if exists $widget->{req_h};
+         $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
+         $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
+
+         $widget->{x}       = int 0.5 + $widget->{x}        * $sx if $widget->{x} =~ /^[0-9.]+$/;
+         $widget->{w}       = int 0.5 + $widget->{w}        * $sx if exists $widget->{w};
+         $widget->{force_w} = int 0.5 + $widget->{force_w}  * $sx if exists $widget->{force_w};
+         $widget->{y}       = int 0.5 + $widget->{y}        * $sy if $widget->{y} =~ /^[0-9.]+$/;
+         $widget->{h}       = int 0.5 + $widget->{h}        * $sy if exists $widget->{h};
+         $widget->{force_h} = int 0.5 + $widget->{force_h}  * $sy if exists $widget->{force_h};
+
+         $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
+         $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
+
       }
    }
 
@@ -196,26 +204,33 @@
    my $class = shift;
 
    my $self = bless {
-      x          => 0,
-      y          => 0,
+      x          => "center",
+      y          => "center",
       z          => 0,
+      w          => undef,
+      h          => undef,
       can_events => 1,
       @_
    }, $class;
 
+   Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
+
    for (keys %$self) {
       if (/^on_(.*)$/) {
          $self->connect ($1 => delete $self->{$_});
       }
    }
 
-   Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
-
    if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
-      $self->{req_x} = $layout->{x} * $::WIDTH;
-      $self->{req_y} = $layout->{y} * $::HEIGHT;
-      $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
-      $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
+      $self->{x}       = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
+      $self->{y}       = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
+      $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
+      $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
+
+      $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
+      $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
+
+      $self->show if $layout->{show};
    }
 
    $self
@@ -236,18 +251,6 @@
    $CFClient::UI::ROOT->add ($self);
 }
 
-sub center {
-   my ($self) = @_;
-
-   $CFClient::UI::ROOT->on_post_alloc (
-      "center_$self" => sub {
-         $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
-      },
-   );
-
-   $self->update;
-}
-
 sub set_visible {
    my ($self) = @_;
 
@@ -310,11 +313,11 @@
       if $self->{parent};
 }
 
-sub move {
+sub move_abs {
    my ($self, $x, $y, $z) = @_;
 
-   $self->{x} = int $x;
-   $self->{y} = int $y;
+   $self->{x} = List::Util::max 0, int $x;
+   $self->{y} = List::Util::max 0, int $y;
    $self->{z} = $z if defined $z;
 
    $self->update;
@@ -323,8 +326,8 @@
 sub set_size {
    my ($self, $w, $h) = @_;
 
-   $self->{def_w} = $w;
-   $self->{def_h} = $h;
+   $self->{force_w} = $w;
+   $self->{force_h} = $h;
 
    $self->realloc;
 }
@@ -338,27 +341,30 @@
    my ($self, $x, $y, $w, $h) = @_;
 
    if ($self->{aspect}) {
-      my $w2 = List::Util::min $w, int $h * $self->{aspect};
-      my $h2 = List::Util::min $h, int $w / $self->{aspect};
+      my ($ow, $oh) = ($w, $h);
 
-      # use alignment to adjust x, y
+      $w = List::Util::min $w, int $h * $self->{aspect};
+      $h = List::Util::min $h, int $w / $self->{aspect};
 
-      $x += int +($w - $w2) * 0.5;
-      $y += int +($h - $h2) * 0.5;
+      # use alignment to adjust x, y
 
-      ($w, $h) = ($w2, $h2);
+      $x += int 0.5 * ($ow - $w);
+      $y += int 0.5 * ($oh - $h);
    }
 
-   if ($self->{x} != $x || $self->{y} != $y) {
+   if ($self->{x} ne $x || $self->{y} ne $y) {
       $self->{x} = $x;
       $self->{y} = $y;
       $self->update;
    }
 
-   if ($self->{w} != $w || $self->{h} != $h) {
+   if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
       return unless $self->{visible};
 
-      $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
+      $self->{alloc_w} = $w;
+      $self->{alloc_h} = $h;
+
+      $self->{root}{size_alloc}{$self+0} = $self;
    }
 }
 
@@ -367,6 +373,11 @@
 }
 
 sub children {
+   # nop
+}
+
+sub visible_children {
+   $_[0]->children
 }
 
 sub set_max_size {
@@ -435,22 +446,18 @@
       unless $FOCUS;
 }
 
-sub mouse_motion { }
-sub button_up    { }
-sub key_down     { }
-sub key_up       { }
+sub mouse_motion { 0 }
+sub button_up    { 0 }
+sub key_down     { 0 }
+sub key_up       { 0 }
 
 sub button_down {
    my ($self, $ev, $x, $y) = @_;
 
    $self->focus_in;
-}
 
-sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
-sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
-sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
-sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
-sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
+   0
+}
 
 sub find_widget {
    my ($self, $x, $y) = @_;
@@ -468,7 +475,6 @@
    my ($self, $parent) = @_;
 
    Scalar::Util::weaken ($self->{parent} = $parent);
-
    $self->set_visible if $parent->{visible};
 }
 
@@ -499,12 +505,13 @@
    my ($self) = @_;
 
    if ($self->{visible}) {
-      return if $self->{root}{realloc}{$self};
+      return if $self->{root}{realloc}{$self+0};
 
-      $self->{root}{realloc}{$self} = $self;
+      $self->{root}{realloc}{$self+0} = $self;
       $self->{root}->update;
    } else {
       delete $self->{req_w};
+      delete $self->{req_h};
    }
 }
 
@@ -515,11 +522,32 @@
       if $self->{parent};
 }
 
+sub reconfigure {
+   my ($self) = @_;
+
+   $self->realloc;
+   $self->update;
+}
+
+# using global variables seems a bit hacky, but passing through all drawing
+# functions seems pointless.
+our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
+
 sub draw {
    my ($self) = @_;
 
    return unless $self->{h} && $self->{w};
 
+   # update screen rectangle
+   local $draw_x = $draw_x + $self->{x};
+   local $draw_y = $draw_y + $self->{y};
+   local $draw_w = $draw_x + $self->{w};
+   local $draw_h = $draw_y + $self->{h};
+
+   # skip widgets that are entirely outside the drawing area
+   return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
+          || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
+
    glPushMatrix;
    glTranslate $self->{x}, $self->{y}, 0;
    $self->_draw;
@@ -540,7 +568,7 @@
       glDisable GL_BLEND;
    }
 
-   if ($ENV{PCLIENT_DEBUG}) {
+   if ($ENV{CFPLUS_DEBUG} & 1) {
       glPushMatrix;
       glColor 1, 1, 0, 1;
       glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
@@ -626,7 +654,9 @@
 }
 
 sub size_request {
-   (0, 0)
+   my ($self) = @_;
+
+   ($self->{w} + 0, $self->{h} + 0)
 }
 
 sub draw { }
@@ -640,14 +670,16 @@
 sub new {
    my ($class, %arg) = @_;
 
-   my $children = delete $arg{children} || [];
+   my $children = delete $arg{children};
 
    my $self = $class->SUPER::new (
       children   => [],
       can_events => 0,
       %arg,
    );
-   $self->add ($_) for @$children;
+
+   $self->add (@$children)
+      if $children;
 
    $self
 }
@@ -705,7 +737,7 @@
 
    my $res;
 
-   for (reverse @{ $self->{children} }) {
+   for (reverse $self->visible_children) {
       $res = $_->find_widget ($x, $y)
          and return $res;
    }
@@ -757,13 +789,15 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h, $changed) = @_;
+   my ($self, $w, $h) = @_;
 
    $self->{children}[0]->configure (0, 0, $w, $h);
 }
 
 #############################################################################
 
+# back-buffered drawing area
+
 package CFClient::UI::Window;
 
 our @ISA = CFClient::UI::Bin::;
@@ -784,15 +818,16 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h, $changed) = @_;
+   my ($self, $w, $h) = @_;
 
-   $self->SUPER::size_allocate ($w, $h, $changed);
-   $self->update
-      if $changed;
+   $self->SUPER::size_allocate ($w, $h);
+   $self->update;
 }
 
 sub _render {
-   $_[0]{children}[0]->draw;
+   my ($self) = @_;
+
+   $self->{children}[0]->draw;
 }
 
 sub render_child {
@@ -802,6 +837,13 @@
       glClearColor 0, 0, 0, 0;
       glClear GL_COLOR_BUFFER_BIT;
 
+      {
+         package CFClient::UI::Base;
+
+         ($draw_x, $draw_y, $draw_w, $draw_h) =
+            (0, 0, $self->{w}, $self->{h});
+      }
+
       $self->_render;
    };
 }
@@ -809,7 +851,7 @@
 sub _draw {
    my ($self) = @_;
 
-   my ($w, $h) = ($self->w, $self->h);
+   my ($w, $h) = @$self{qw(w h)};
 
    my $tex = $self->{texture}
       or return;
@@ -842,7 +884,7 @@
 sub size_request {
    my ($self) = @_;
 
-   my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
+   my ($w, $h) = @{$self->child}{qw(req_w req_h)};
 
    $w = 10 if $self->{scroll_x};
    $h = 10 if $self->{scroll_y};
@@ -851,10 +893,12 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h, $changed) = @_;
+   my ($self, $w, $h) = @_;
+
+   my $child = $self->child;
 
-   $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
-   $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
+   $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
+   $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
 
    $self->child->configure (0, 0, $w, $h);
    $self->update;
@@ -900,6 +944,9 @@
 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};
+
    CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
 
    $self->SUPER::_render;
@@ -912,7 +959,9 @@
 our @ISA = CFClient::UI::HBox::;
 
 sub new {
-   my $class = shift;
+   my ($class, %arg) = @_;
+
+   my $child = delete $arg{child};
 
    my $self;
 
@@ -927,16 +976,21 @@
    $self = $class->SUPER::new (
       vp     => (new CFClient::UI::ViewPort expand => 1),
       slider => $slider,
-      @_,
+      %arg,
    );
 
-   $self->{vp}->add ($self->{scrolled});
-   $self->add ($self->{vp});
-   $self->add ($self->{slider});
+   $self->SUPER::add ($self->{vp}, $self->{slider});
+   $self->add ($child) if $child;
 
    $self
 }
 
+sub add {
+   my ($self, $widget) = @_;
+
+   $self->{vp}->add ($self->{child} = $widget);
+}
+
 sub update {
    my ($self) = @_;
 
@@ -948,9 +1002,9 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h, $changed) = @_;
+   my ($self, $w, $h) = @_;
 
-   $self->SUPER::size_allocate ($w, $h, $changed);
+   $self->SUPER::size_allocate ($w, $h);
 
    my $child = $self->{vp}->child;
    $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
@@ -1007,31 +1061,46 @@
 
 use CFClient::OpenGL;
 
-my @tex = 
+my $bg = 
+      new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
+         mipmap => 1, wrap => 1;
+
+my @border = 
       map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
-         qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
+         qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
 
 sub new {
-   my $class = shift;
+   my ($class, %arg) = @_;
+
+   my $title = delete $arg{title};
 
    my $self = $class->SUPER::new (
       bg          => [1, 1, 1, 1],
       border_bg   => [1, 1, 1, 1],
       border      => 0.6,
-      is_toplevel => 1,
       can_events  => 1,
-      @_
+      min_w       => 16,
+      min_h       => 16,
+      %arg,
    );
 
-   $self->{title} &&= new CFClient::UI::Label
+   $self->{title} = new CFClient::UI::Label
       align    => 0,
       valign   => 1,
-      text     => $self->{title},
-      fontsize => $self->{border};
+      text     => $title,
+      fontsize => $self->{border}
+         if defined $title;
 
    $self
 }
 
+sub add {
+   my ($self, @widgets) = @_;
+
+   $self->SUPER::add (@widgets);
+   $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
+}
+
 sub border {
    int $_[0]{border} * $::FONTSIZE
 }
@@ -1039,6 +1108,9 @@
 sub size_request {
    my ($self) = @_;
 
+   $self->{title}->size_request
+      if $self->{title};
+
    my ($w, $h) = $self->SUPER::size_request;
 
    (
@@ -1048,17 +1120,20 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h, $changed) = @_;
-
-   return unless $changed;
+   my ($self, $w, $h) = @_;
 
-   $h -= List::Util::max 0, $self->border * 2;
-   $w -= List::Util::max 0, $self->border * 2;
+   if ($self->{title}) {
+      $self->{title}{w} = $w;
+      $self->{title}{h} = $h;
+      $self->{title}->size_allocate ($w, $h);
+   }
 
-   $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
-      if $self->{title};
+   my $border = $self->border;
 
-   $self->child->configure ($self->border, $self->border, $w, $h);
+   $h -= List::Util::max 0, $border * 2;
+   $w -= List::Util::max 0, $border * 2;
+   
+   $self->child->configure ($border, $border, $w, $h);
 }
 
 sub button_down {
@@ -1084,12 +1159,11 @@
          my $dx = $ev->{x} - $ox;
          my $dy = $ev->{y} - $oy;
 
-         $self->{user_x} = $wx + $dx * $mx;
-         $self->{user_y} = $wy + $dy * $my;
-         $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
-         $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
-         $self->move ($self->{user_x}, $self->{user_y});
+         $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
+         $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
+
          $self->realloc;
+         $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
       };
 
    } elsif ($lr ^ $td) {
@@ -1101,32 +1175,36 @@
 
          ($x, $y) = ($ev->{x}, $ev->{y});
 
-         $self->{user_x} = $bx + $x - $ox;
-         $self->{user_y} = $by + $y - $oy;
-
-         $self->move ($self->{user_x}, $self->{user_y});
-         $self->realloc;
+         $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
       };
+   } else {
+      return 0;
    }
+
+   1
 }
 
 sub button_up {
    my ($self, $ev, $x, $y) = @_;
 
-   delete $self->{motion};
+   !!delete $self->{motion}
 }
 
 sub mouse_motion {
    my ($self, $ev, $x, $y) = @_;
 
    $self->{motion}->($ev, $x, $y) if $self->{motion};
+
+   !!$self->{motion}
 }
 
 sub _draw {
    my ($self) = @_;
 
+   my $child = $self->{children}[0];
+
    my ($w,  $h ) = ($self->{w}, $self->{h});
-   my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
+   my ($cw, $ch) = ($child->{w}, $child->{h});
 
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
@@ -1134,31 +1212,29 @@
    my $border = $self->border;
 
    glColor @{ $self->{border_bg} };
-   $tex[1]->draw_quad_alpha (0, 0, $w, $border);
-   $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
-   $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
-   $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
+   $border[0]->draw_quad_alpha (0, 0, $w, $border);
+   $border[1]->draw_quad_alpha (0, $border, $border, $ch);
+   $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
+   $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
 
    if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
-      my $bg = $tex[0];
-
-      # TODO: repeat texture not scale
-      my $rep_x = $cw / $bg->{w};
-      my $rep_y = $ch / $bg->{h};
-
       glColor @{ $self->{bg} };
 
-      $bg->{s} = $rep_x;
-      $bg->{t} = $rep_y;
-      $bg->{wrap_mode} = 1;
+      # TODO: repeat texture not scale
+      # solve this better(?)
+      $bg->{s} = $cw / $bg->{w};
+      $bg->{t} = $ch / $bg->{h};
       $bg->draw_quad_alpha ($border, $border, $cw, $ch);
    }
 
    glDisable GL_TEXTURE_2D;
 
-   $self->{title}->draw if $self->{title};
+   $child->draw;
 
-   $self->child->draw;
+   if ($self->{title}) {
+      glTranslate 0, $border - $self->{h};
+      $self->{title}->_draw;
+   }
 }
 
 #############################################################################
@@ -1242,7 +1318,7 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h, $changed) = @_;
+   my ($self, $w, $h) = @_;
 
    my ($ws, $hs) = $self->get_wh;
 
@@ -1330,7 +1406,7 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h, $changed) = @_;
+   my ($self, $w, $h) = @_;
 
    my $space = $self->{vertical} ? $h : $w;
    my $children = $self->{children};
@@ -1423,7 +1499,8 @@
       fontsize   => 1,
       align      => -1,
       valign     => -1,
-      padding    => 2,
+      padding_x  => 2,
+      padding_y  => 2,
       can_events => 0,
       %arg
    );
@@ -1509,17 +1586,16 @@
       $h = List::Util::max $h, $h2;
    }
 
-   (
-      $w + $self->{padding} * 2,
-      $h + $self->{padding} * 2,
-   )
+   ($w, $h)
 }
 
 sub size_allocate {
-   my ($self, $w, $h, $changed) = @_;
+   my ($self, $w, $h) = @_;
+
+   delete $self->{ox};
 
    delete $self->{texture}
-      if $changed;
+      unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
 }
 
 sub set_fontsize {
@@ -1544,17 +1620,17 @@
       $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
       $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
 
-      my $tex = new_from_layout CFClient::Texture $self->{layout};
+      new_from_layout CFClient::Texture $self->{layout}
+   };
 
-      $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
-                       : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
+   unless (exists $self->{ox}) {
+      $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
+                       : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
                        :                      ($self->{w} - $tex->{w}) * 0.5);
 
-      $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
-                       : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
+      $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);
-
-      $tex
    };
 
    glEnable GL_TEXTURE_2D;
@@ -1659,11 +1735,15 @@
       $self->_emit ('escape');
    } elsif ($uni) {
       substr $text, $self->{cursor}++, 0, chr $uni;
+   } else {
+      return 0;
    }
 
    $self->_set_text ($text);
 
    $self->realloc;
+
+   1
 }
 
 sub focus_in {
@@ -1688,11 +1768,15 @@
 
    $self->_set_text ($self->{text});
    $self->update;
+   
+   1
 }
 
 sub mouse_motion {
    my ($self, $ev, $x, $y) = @_;
 #   printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
+
+   0
 }
 
 sub _draw {
@@ -1779,9 +1863,10 @@
       }
 
    } else {
-      $self->SUPER::key_down ($ev);
+      return $self->SUPER::key_down ($ev)
    }
 
+   1
 }
 
 #############################################################################
@@ -1800,7 +1885,8 @@
    my $class = shift;
 
    $class->SUPER::new (
-      padding    => 4,
+      padding_x  => 4,
+      padding_y  => 4,
       fg         => [1, 1, 1],
       active_fg  => [0, 0, 1],
       can_hover  => 1,
@@ -1819,6 +1905,8 @@
    $self->emit ("activate")
       if $x >= 0 && $x < $self->{w}
          && $y >= 0 && $y < $self->{h};
+
+   1
 }
 
 sub _draw {
@@ -1857,7 +1945,8 @@
    my $class = shift;
 
    $class->SUPER::new (
-      padding   => 2,
+      padding_x => 2,
+      padding_y => 2,
       fg        => [1, 1, 1],
       active_fg => [1, 1, 0],
       bg        => [0, 0, 0, 0.2],
@@ -1871,17 +1960,21 @@
 sub size_request {
    my ($self) = @_;
 
-   ($self->{padding} * 2 + 6) x 2
+   (6) x 2
 }
 
 sub button_down {
    my ($self, $ev, $x, $y) = @_;
 
-   if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
-       && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
+   if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
+       && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
       $self->{state} = !$self->{state};
       $self->_emit (changed => $self->{state});
+   } else {
+      return 0
    }
+
+   1
 }
 
 sub _draw {
@@ -1889,9 +1982,11 @@
 
    $self->SUPER::_draw;
 
-   glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
+   glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
+
+   my ($w, $h) = @$self{qw(w h)};
 
-   my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
+   my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
 
    glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
 
@@ -2166,8 +2261,8 @@
       bg        => [0, 0, 0, 0.2],
       active_bg => [1, 1, 1, 0.5],
       range     => [0, 0, 100, 10, 0],
-      req_w     => $::WIDTH / 80,
-      req_h     => $::WIDTH / 80,
+      min_w     => $::WIDTH / 80,
+      min_h     => $::WIDTH / 80,
       vertical  => 0,
       can_hover => 1,
       inner_pad => 0.02,
@@ -2217,10 +2312,7 @@
 sub size_request {
    my ($self) = @_;
 
-   my $w = $self->{req_w};
-   my $h = $self->{req_h};
-
-   $self->{vertical} ? ($h, $w) : ($w, $h)
+   ($self->{req_w}, $self->{req_h})
 }
 
 sub button_down {
@@ -2230,7 +2322,7 @@
 
    $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
    
-   $self->mouse_motion ($ev, $x, $y);
+   $self->mouse_motion ($ev, $x, $y)
 }
 
 sub mouse_motion {
@@ -2244,13 +2336,24 @@
       $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
 
       $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
+   } else {
+      return 0;
    }
+
+   1
 }
 
 sub update {
    my ($self) = @_;
 
-   $CFClient::UI::ROOT->on_post_alloc ($self => sub {
+   delete $self->{knob_w};
+   $self->SUPER::update;
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   unless ($self->{knob_w}) {
       $self->set_value ($self->{range}[0]);
 
       my ($value, $lo, $hi, $page) = @{$self->{range}};
@@ -2266,13 +2369,7 @@
 
       $self->{knob_x} = $value - $knob_w * 0.5;
       $self->{knob_w} = $knob_w;
-   });
-
-   $self->SUPER::update;
-}
-
-sub _draw {
-   my ($self) = @_;
+   }
 
    $self->SUPER::_draw ();
 
@@ -2380,11 +2477,9 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h, $changed) = @_;
-
-   $self->SUPER::size_allocate ($w, $h, $changed);
+   my ($self, $w, $h) = @_;
 
-   return unless $changed;
+   $self->SUPER::size_allocate ($w, $h);
 
    $self->{layout}->set_font ($self->{font}) if $self->{font};
    $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
@@ -2617,8 +2712,17 @@
 sub set_tooltip_from {
    my ($self, $widget) = @_;
 
+   my $tooltip = $widget->{tooltip};
+
+   if ($ENV{CFPLUS_DEBUG} & 2) {
+      $tooltip .= "\n\n" . (ref $widget) . "\n"
+                . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
+                . "req $widget->{req_w} $widget->{req_h}\n"
+                . "visible $widget->{visible}";
+   }
+
    $self->add (new CFClient::UI::Label
-      markup    => $widget->{tooltip},
+      markup    => $tooltip,
       max_w     => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
       fontsize  => 0.8,
       fg        => [0, 0, 0, 1],
@@ -2636,11 +2740,27 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h, $changed) = @_;
+   my ($self, $w, $h) = @_;
 
-   return unless $changed;
+   $self->SUPER::size_allocate ($w - 4, $h - 4);
+}
+
+sub visibility_change {
+   my ($self, $visible) = @_;
 
-   $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
+   return unless $visible;
+
+   $self->{root}->on_post_alloc ("move_$self" => sub {
+      my $widget = $self->{owner}
+         or return;
+
+      my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
+
+      ($x, $y) = $widget->coord2global (-$self->{w}, 0)
+         if $x + $self->{w} > $::WIDTH;
+
+      $self->move_abs ($x, $y);
+   });
 }
 
 sub _draw {
@@ -2753,45 +2873,11 @@
 
 #############################################################################
 
-package CFClient::UI::Inventory;
-
-our @ISA = CFClient::UI::ScrolledWindow::;
-
-sub new {
-   my $class = shift;
-
-   my $self = $class->SUPER::new (
-      scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
-      @_,
-   );
-
-   $self
-}
-
-sub set_items {
-   my ($self, $items) = @_;
-
-   $self->{scrolled}->clear;
-   return unless $items;
-
-   my @items = sort {
-      ($a->{type} <=> $b->{type})
-         or ($a->{name} cmp $b->{name})
-   } @$items;
-
-   $self->{real_items} = \@items;
-
-   my $row = 0;
-   for my $item (@items) {
-      CFClient::Item::update_widgets $item;
+package CFClient::UI::Buttonbar;
 
-      $self->{scrolled}->add (0, $row, $item->{face_widget});
-      $self->{scrolled}->add (1, $row, $item->{desc_widget});
-      $self->{scrolled}->add (2, $row, $item->{weight_widget});
+our @ISA = CFClient::UI::HBox::;
 
-      $row++;
-   }
-}
+# TODO: should actualyl wrap buttons and other goodies.
 
 #############################################################################
 
@@ -2842,7 +2928,7 @@
    $self->{button} = $ev->{button};
 
    $self->show;
-   $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
+   $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
 }
 
 sub mouse_motion {
@@ -2851,6 +2937,8 @@
    # TODO: should use vbox->find_widget or so
    $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
    $self->{hover} = $self->{item}{$HOVER};
+
+   0
 }
 
 sub button_up {
@@ -2862,7 +2950,119 @@
 
       $self->_emit ("popdown");
       $self->{hover}[1]->() if $self->{hover};
+   } else {
+      return 0
    }
+
+   1
+}
+
+#############################################################################
+
+package CFClient::UI::Multiplexer;
+
+our @ISA = CFClient::UI::Container::;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      @_,
+   );
+
+   $self->{current} = $self->{children}[0]
+      if @{ $self->{children} };
+
+   $self
+}
+
+sub add {
+   my ($self, @widgets) = @_;
+
+   $self->SUPER::add (@widgets);
+
+   $self->{current} = $self->{children}[0]
+      if @{ $self->{children} };
+}
+
+sub set_current_page {
+   my ($self, $page_or_widget) = @_;
+
+   my $widget = ref $page_or_widget
+                   ? $page_or_widget
+                   : $self->{children}[$page_or_widget];
+
+   $self->{current} = $widget;
+   $self->{current}->configure (0, 0, $self->{w}, $self->{h});
+
+   $self->_emit (page_changed => $self->{current});
+
+   $self->realloc;
+}
+
+sub visible_children {
+   $_[0]{current}
+}
+
+sub size_request {
+   my ($self) = @_;
+
+   $self->{current}->size_request
+}
+
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->{current}->configure (0, 0, $w, $h);
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   $self->{current}->draw;
+}
+
+#############################################################################
+
+package CFClient::UI::Notebook;
+
+our @ISA = CFClient::UI::VBox::;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      buttonbar   => (new CFClient::UI::Buttonbar),
+      multiplexer => (new CFClient::UI::Multiplexer expand => 1),
+      # filter => # will be put between multiplexer and $self
+      @_,
+   );
+   
+   $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
+   $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
+
+   $self
+}
+
+sub add {
+   my ($self, $title, $widget, $tooltip) = @_;
+
+   Scalar::Util::weaken $self;
+
+   $self->{buttonbar}->add (new CFClient::UI::Button
+      markup      => $title,
+      tooltip     => $tooltip,
+      on_activate => sub { $self->set_current_page ($widget) },
+   );
+
+   $self->{multiplexer}->add ($widget);
+}
+
+sub set_current_page {
+   my ($self, $page) = @_;
+
+   $self->{multiplexer}->set_current_page ($page);
+   $self->_emit (page_changed => $self->{multiplexer}{current});
 }
 
 #############################################################################
@@ -2977,39 +3177,318 @@
 
 #############################################################################
 
-package CFClient::UI::Root;
-
-our @ISA = CFClient::UI::Container::;
+package CFClient::UI::Inventory;
 
-use CFClient::OpenGL;
+our @ISA = CFClient::UI::ScrolledWindow::;
 
 sub new {
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      visible => 1,
+      child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
       @_,
    );
 
-   Scalar::Util::weaken ($self->{root} = $self);
+   $self
+}
+
+sub set_items {
+   my ($self, $items) = @_;
+
+   $self->{child}->clear;
+   return unless $items;
+
+   my @items = sort {
+      ($a->{type} <=> $b->{type})
+         or ($a->{name} cmp $b->{name})
+   } @$items;
+
+   $self->{real_items} = \@items;
+
+   my $row = 0;
+   for my $item (@items) {
+      CFClient::Item::update_widgets $item;
+
+      $self->{child}->add (0, $row, $item->{face_widget});
+      $self->{child}->add (1, $row, $item->{desc_widget});
+      $self->{child}->add (2, $row, $item->{weight_widget});
+
+      $row++;
+   }
+}
+
+#############################################################################
+
+package CFClient::UI::BindEditor;
+
+our @ISA = CFClient::UI::FancyFrame::;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (binding => [], commands => [], @_);
+
+   $self->add (my $vb = new CFClient::UI::VBox);
+
+
+   $vb->add ($self->{rec_btn} = new CFClient::UI::Button
+      text => "start recording",
+      tooltip => "Start/Stops recording of actions."
+                ."All subsequent actions after the recording started will be captured."
+                ."The actions are displayed after the record was stopped."
+                ."To bind the action you have to click on the 'Bind' button",
+      on_activate => sub {
+         unless ($self->{recording}) {
+            $self->start;
+         } else {
+            $self->stop;
+         }
+      });
+
+   $vb->add (new CFClient::UI::Label text => "Actions:");
+   $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
+
+   $vb->add (new CFClient::UI::Label text => "Bound to: ");
+   $vb->add (my $hb = new CFClient::UI::HBox);
+   $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
+   $hb->add (new CFClient::UI::Button
+      text => "bind",
+      tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
+      on_activate => sub {
+         $self->ask_for_bind;
+      });
+
+   $vb->add (my $hb = new CFClient::UI::HBox);
+   $hb->add (new CFClient::UI::Button
+      text => "ok",
+      expand => 1,
+      tooltip => "This closes the binding editor and saves the binding",
+      on_activate => sub {
+         $self->hide;
+         $self->commit;
+      });
+
+   $hb->add (new CFClient::UI::Button
+      text => "cancel",
+      expand => 1,
+      tooltip => "This closes the binding editor without saving",
+      on_activate => sub {
+         $self->hide;
+         $self->{binding_cancel}->()
+            if $self->{binding_cancel};
+      });
+
+   $self->update_binding_widgets;
 
    $self
 }
 
-sub configure {
-   my ($self, $x, $y, $w, $h) = @_;
+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->{w} = $w;
-   $self->{h} = $h;
+   $self->{rec_btn}->set_text ("stop recording");
+   $self->{recording} = 1;
+   $self->clear_command_list;
+   $::CONN->start_record if $::CONN;
 }
 
-sub reconfigure {
+sub stop {
    my ($self) = @_;
 
-   $self->SUPER::reconfigure;
+   $self->{rec_btn}->set_text ("start recording");
+   $self->{recording} = 0;
 
-   $self->size_allocate ($self->{w}, $self->{h}, 1)
-      if $self->{w};
+   my $rec;
+   $rec = $::CONN->stop_record if $::CONN;
+   return unless ref $rec eq 'ARRAY';
+   $self->set_command_list ($rec);
+}
+
+
+sub ask_for_bind_and_commit {
+   my ($self) = @_;
+   $self->ask_for_bind (1);
+}
+
+sub ask_for_bind {
+   my ($self, $commit) = @_;
+
+   CFClient::Binder::open_binding_dialog (sub {
+      my ($mod, $sym) = @_;
+      $self->{binding} = [$mod, $sym];  # XXX: how to stop that memleak?
+      $self->update_binding_widgets;
+      $self->commit if $commit;
+   });
+}
+
+# $mod and $sym are the modifiers and key symbol
+# $cmds is a array ref of strings (the commands)
+# $cb is the callback that is executed on OK
+# $ccb is the callback that is executed on CANCEL and 
+# when the binding was unsuccessful on OK
+sub set_binding {
+   my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
+
+   $self->clear_command_list;
+   $self->{recording} = 0;
+   $self->{rec_btn}->set_text ("start recording");
+
+   $self->{binding} = [$mod, $sym];
+   $self->{commands} = $cmds;
+
+   $self->{binding_change} = $cb;
+   $self->{binding_cancel} = $ccb;
+
+   $self->update_binding_widgets;
+}
+
+# this is a shortcut method that asks for a binding
+# and then just binds it.
+sub do_quick_binding {
+   my ($self, $cmds) = @_;
+   $self->set_binding (undef, undef, $cmds, sub {
+      $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
+   });
+   $self->ask_for_bind (1);
+}
+
+sub update_binding_widgets {
+   my ($self) = @_;
+   my ($mod, $sym, $cmds) = $self->get_binding;
+   $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
+   $self->set_command_list ($cmds);
+}
+
+sub get_binding {
+   my ($self) = @_;
+   return (
+      $self->{binding}->[0],
+      $self->{binding}->[1],
+      [ grep { defined $_ } @{$self->{commands}} ]
+   );
+}
+
+sub clear_command_list {
+   my ($self) = @_;
+   $self->{cmdbox}->clear ();
+}
+
+sub set_command_list {
+   my ($self, $cmds) = @_;
+
+   $self->{cmdbox}->clear ();
+   $self->{commands} = $cmds;
+
+   my $idx = 0;
+
+   for (@$cmds) {
+      $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
+
+      my $i = $idx;
+      $hb->add (new CFClient::UI::Label text => $_);
+      $hb->add (new CFClient::UI::Button
+         text => "delete",
+         tooltip => "Deletes the action from the record",
+         on_activate => sub {
+            $self->{cmdbox}->remove ($hb);
+            $cmds->[$i] = undef;
+         });
+
+
+      $idx++
+   }
+}
+
+#############################################################################
+
+package CFClient::UI::SpellList;
+
+our @ISA = CFClient::UI::Table::;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      binding  => [],
+      commands => [],
+      @_,
+   )
+}
+
+# XXX: Do sorting? Argl...
+sub add_spell {
+   my ($self, $spell) = @_;
+   $self->{spells}->{$spell->{name}} = $spell;
+
+   $self->add (0, $self->{tbl_idx},   new CFClient::UI::Face
+      face => $spell->{face},
+      can_hover => 1,
+      can_events => 1,
+      tooltip => $spell->{message});
+
+   $self->add (1, $self->{tbl_idx},   new CFClient::UI::Label
+      text => $spell->{name},
+      can_hover => 1,
+      can_events => 1,
+      tooltip => $spell->{message},
+      expand => 1);
+
+   $self->add (2, $self->{tbl_idx},   new CFClient::UI::Label
+      text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
+                 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
+      expand => 1);
+
+   $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
+      text => "bind to key",
+      on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
+}
+
+sub rebuild_spell_list {
+   my ($self) = @_;
+   $self->{tbl_idx} = 0;
+   $self->add_spell ($_) for values %{$self->{spells}};
+}
+
+sub remove_spell {
+   my ($self, $spell) = @_;
+   delete $self->{spells}->{$spell->{name}};
+   $self->rebuild_spell_list;
+}
+
+#############################################################################
+
+package CFClient::UI::Root;
+
+our @ISA = CFClient::UI::Container::;
+
+use CFClient::OpenGL;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      visible => 1,
+      @_,
+   );
+
+   Scalar::Util::weaken ($self->{root} = $self);
+
+   $self
 }
 
 sub size_request {
@@ -3018,22 +3497,31 @@
    ($self->{w}, $self->{h})
 }
 
+sub _to_pixel {
+   my ($coord, $size, $max) = @_;
+
+   $coord =
+      $coord eq "center" ? ($max - $size) * 0.5
+    : $coord eq "max"    ? $max
+    :                      $coord;
+
+   $coord = 0            if $coord < 0;
+   $coord = $max - $size if $coord > $max - $size;
+
+   int $coord + 0.5
+}
+
 sub size_allocate {
-   my ($self, $w, $h, $changed) = @_;
+   my ($self, $w, $h) = @_;
 
    for my $child ($self->children) {
       my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
 
-      $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
-         if exists $child->{req_x};
-
-      $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
-         if exists $child->{req_y};
+      $X = $child->{force_x} if exists $child->{force_x};
+      $Y = $child->{force_y} if exists $child->{force_y};
 
-      #delete @$child{qw(req_x req_y)};#d# def_x, def_y
-
-      $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
-      $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
+      $X = _to_pixel $X, $W, $self->{w};
+      $Y = _to_pixel $Y, $H, $self->{h};
 
       $child->configure ($X, $Y, $W, $H);
    }
@@ -3060,13 +3548,8 @@
 sub add {
    my ($self, @children) = @_;
 
-   for my $child (@children) {
-      $child->{is_toplevel} = 1;
-
-      # integerise window positions
-      $child->{x} = int $child->{x};
-      $child->{y} = int $child->{y};
-   }
+   $_->{is_toplevel} = 1
+      for @children;
 
    $self->SUPER::add (@children);
 }
@@ -3076,6 +3559,9 @@
 
    $self->SUPER::remove (@children);
 
+   delete $self->{is_toplevel}
+      for @children;
+
    while (@children) {
       my $w = pop @children;
       push @children, $w->children;
@@ -3104,52 +3590,85 @@
    }
 
    if ($self->{realloc}) {
+      my %queue;
       my @queue;
+      my $widget;
 
+      outer:
       while () {
-         if ($self->{realloc}) {
-            #TODO use array-of-depth approach
+         if (my $realloc = delete $self->{realloc}) {
+            for $widget (values %$realloc) {
+               $widget->{visible} or next; # do not resize invisible widgets
+
+               $queue{$widget+0}++ and next; # duplicates are common
 
-            @queue = sort { $a->{visible} <=> $b->{visible} }
-                          @queue, values %{delete $self->{realloc}};
+               push @{ $queue[$widget->{visible}] }, $widget;
+            }
          }
 
-         my $widget = pop @queue || last;
+         while () {
+            @queue or last outer;
 
-         $widget->{visible} or last; # do not resize invisible widgets
+            $widget = pop @{ $queue[-1] || [] }
+               and last;
+            
+            pop @queue;
+         }
 
-         my ($w, $h) = $widget->{def_w} && $widget->{def_h}
-            ? @$widget{qw(def_w def_h)}
-            : $widget->size_request;
+         delete $queue{$widget+0};
 
-         Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
-            
-         $widget->{req_w} = $w;
-         $widget->{req_h} = $h;
+         my ($w, $h) = $widget->size_request;
+
+         $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
+         $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
+
+         $w = $widget->{force_w} if exists $widget->{force_w};
+         $h = $widget->{force_h} if exists $widget->{force_h};
 
-         $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
+         if ($widget->{req_w} != $w || $widget->{req_h} != $h
+             || delete $widget->{force_realloc}) {
+            $widget->{req_w} = $w;
+            $widget->{req_h} = $h;
 
-         push @queue, $widget->{parent}
-            if $widget->{parent};
+            $self->{size_alloc}{$widget+0} = $widget;
+
+            if (my $parent = $widget->{parent}) {
+               $self->{realloc}{$parent+0} = $parent
+                  unless $queue{$parent+0};
+
+               $parent->{force_size_alloc} = 1;
+               $self->{size_alloc}{$parent+0} = $parent;
+            }
+         }
+
+         delete $self->{realloc}{$widget+0};
        }
    }
 
    while (my $size_alloc = delete $self->{size_alloc}) {
-      my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
+      my @queue = sort { $b->{visible} <=> $a->{visible} }
                        values %$size_alloc;
 
       while () {
-         my ($widget, $w, $h) = @{ pop @queue or last };
+         my $widget = pop @queue || last;
+
+         my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
 
          $w = 0 if $w < 0;
          $h = 0 if $h < 0;
 
-         my $changed = $widget->{w} != $w || $widget->{h} != $h;
+         $w = int $w + 0.5;
+         $h = int $h + 0.5;
 
-         $widget->{w} = $w;
-         $widget->{h} = $h;
+         if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
+            $widget->{old_w} = $widget->{w};
+            $widget->{old_h} = $widget->{h};
 
-         $widget->emit (size_allocate => $w, $h, $changed);
+            $widget->{w} = $w;
+            $widget->{h} = $h;
+
+            $widget->emit (size_allocate => $w, $h);
+         }
       }
    }
 
@@ -3158,6 +3677,7 @@
          for values %{delete $self->{post_alloc_hook}};
    }
 
+
    glViewport 0, 0, $::WIDTH, $::HEIGHT;
    glClearColor +($::CFG->{fow_intensity}) x 3, 1;
    glClear GL_COLOR_BUFFER_BIT;
@@ -3168,6 +3688,13 @@
    glMatrixMode GL_MODELVIEW;
    glLoadIdentity;
 
+   {
+      package CFClient::UI::Base;
+
+      ($draw_x, $draw_y, $draw_w, $draw_h) =
+         (0, 0, $self->{w}, $self->{h});
+   }
+
    $self->_draw;
 }