--- deliantra/Deliantra-Client/DC/UI.pm	2006/05/31 13:44:26	1.262
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/06/03 22:50:48	1.275
@@ -42,10 +42,11 @@
 }
 
 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;
 
@@ -172,8 +173,8 @@
 
    for my $widget (values %WIDGET) {
       if ($widget->{is_toplevel}) {
-         $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
-         $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
+         $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};
@@ -182,8 +183,8 @@
          $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} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
-         $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
+         $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
+         $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
 
       }
    }
@@ -372,6 +373,11 @@
 }
 
 sub children {
+   # nop
+}
+
+sub visible_children {
+   $_[0]->children
 }
 
 sub set_max_size {
@@ -440,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) = @_;
@@ -527,11 +529,25 @@
    $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;
@@ -654,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
 }
@@ -719,7 +737,7 @@
 
    my $res;
 
-   for (reverse @{ $self->{children} }) {
+   for (reverse $self->visible_children) {
       $res = $_->find_widget ($x, $y)
          and return $res;
    }
@@ -778,6 +796,8 @@
 
 #############################################################################
 
+# back-buffered drawing area
+
 package CFClient::UI::Window;
 
 our @ISA = CFClient::UI::Bin::;
@@ -805,7 +825,9 @@
 }
 
 sub _render {
-   $_[0]{children}[0]->draw;
+   my ($self) = @_;
+
+   $self->{children}[0]->draw;
 }
 
 sub render_child {
@@ -815,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;
    };
 }
@@ -822,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;
@@ -915,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;
@@ -927,7 +959,9 @@
 our @ISA = CFClient::UI::HBox::;
 
 sub new {
-   my $class = shift;
+   my ($class, %arg) = @_;
+
+   my $child = delete $arg{child};
 
    my $self;
 
@@ -942,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) = @_;
 
@@ -1031,7 +1070,9 @@
          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],
@@ -1040,18 +1081,26 @@
       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
 }
@@ -1059,6 +1108,9 @@
 sub size_request {
    my ($self) = @_;
 
+   $self->{title}->size_request
+      if $self->{title};
+
    my ($w, $h) = $self->SUPER::size_request;
 
    (
@@ -1070,13 +1122,18 @@
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
-   $h -= List::Util::max 0, $self->border * 2;
-   $w -= List::Util::max 0, $self->border * 2;
+   if ($self->{title}) {
+      $self->{title}{w} = $w;
+      $self->{title}{h} = $h;
+      $self->{title}->size_allocate ($w, $h);
+   }
 
-   $self->{title}->configure ($self->border, 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 {
@@ -1120,26 +1177,34 @@
 
          $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;
@@ -1164,9 +1229,12 @@
 
    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;
+   }
 }
 
 #############################################################################
@@ -1524,7 +1592,10 @@
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
-   delete $self->{texture};
+   delete $self->{ox};
+
+   delete $self->{texture}
+      unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
 }
 
 sub set_fontsize {
@@ -1549,8 +1620,10 @@
       $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}
+   };
 
+   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);
@@ -1558,8 +1631,6 @@
       $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;
@@ -1664,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 {
@@ -1693,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 {
@@ -1784,9 +1863,10 @@
       }
 
    } else {
-      $self->SUPER::key_down ($ev);
+      return $self->SUPER::key_down ($ev)
    }
 
+   1
 }
 
 #############################################################################
@@ -1825,6 +1905,8 @@
    $self->emit ("activate")
       if $x >= 0 && $x < $self->{w}
          && $y >= 0 && $y < $self->{h};
+
+   1
 }
 
 sub _draw {
@@ -1888,7 +1970,11 @@
        && $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 {
@@ -2236,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 {
@@ -2250,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}};
@@ -2272,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 ();
 
@@ -2782,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;
+package CFClient::UI::Buttonbar;
 
-   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;
+our @ISA = CFClient::UI::HBox::;
 
-      $self->{scrolled}->add (0, $row, $item->{face_widget});
-      $self->{scrolled}->add (1, $row, $item->{desc_widget});
-      $self->{scrolled}->add (2, $row, $item->{weight_widget});
-
-      $row++;
-   }
-}
+# TODO: should actualyl wrap buttons and other goodies.
 
 #############################################################################
 
@@ -2880,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 {
@@ -2891,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});
 }
 
 #############################################################################
@@ -3006,208 +3177,44 @@
 
 #############################################################################
 
-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 size_request {
-   my ($self) = @_;
-
-   ($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) = @_;
-
-   for my $child ($self->children) {
-      my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
-
-      $X = $child->{force_x} if exists $child->{force_x};
-      $Y = $child->{force_y} if exists $child->{force_y};
-
-      $X = _to_pixel $X, $W, $self->{w};
-      $Y = _to_pixel $Y, $H, $self->{h};
-
-      $child->configure ($X, $Y, $W, $H);
-   }
-}
-
-sub coord2local {
-   my ($self, $x, $y) = @_;
-
-   ($x, $y)
-}
-
-sub coord2global {
-   my ($self, $x, $y) = @_;
-
-   ($x, $y)
-}
-
-sub update {
-   my ($self) = @_;
-
-   $::WANT_REFRESH++;
-}
-
-sub add {
-   my ($self, @children) = @_;
-
-   $_->{is_toplevel} = 1
-      for @children;
-
-   $self->SUPER::add (@children);
-}
-
-sub remove {
-   my ($self, @children) = @_;
-
-   $self->SUPER::remove (@children);
-
-   delete $self->{is_toplevel}
-      for @children;
-
-   while (@children) {
-      my $w = pop @children;
-      push @children, $w->children;
-      $w->set_invisible;
-   }
-}
-
-sub on_refresh {
-   my ($self, $id, $cb) = @_;
-
-   $self->{refresh_hook}{$id} = $cb;
-}
-
-sub on_post_alloc {
-   my ($self, $id, $cb) = @_;
-
-   $self->{post_alloc_hook}{$id} = $cb;
-}
-
-sub draw {
-   my ($self) = @_;
-
-   while ($self->{refresh_hook}) {
-      $_->()
-         for values %{delete $self->{refresh_hook}};
-   }
-
-   if ($self->{realloc}) {
-      my @queue;
-
-      while () {
-         if ($self->{realloc}) {
-            #TODO use array-of-depth approach
-
-            use sort 'stable';
-
-            @queue = sort { $a->{visible} <=> $b->{visible} }
-                          @queue, values %{delete $self->{realloc}};
-         }
-
-         my $widget = pop @queue || last;
-
-         $widget->{visible} or last; # do not resize invisible widgets
-
-         my ($w, $h) = $widget->size_request;
-
-         $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
-         $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
-
-         $w = $widget->{force_w} if exists $widget->{force_w};
-         $h = $widget->{force_h} if exists $widget->{force_h};
-
-         if ($widget->{req_w} != $w || $widget->{req_h} != $h
-             || delete $widget->{force_realloc}) {
-            $widget->{req_w} = $w;
-            $widget->{req_h} = $h;
-
-            $self->{size_alloc}{$widget+0} = $widget;
-
-            if (my $parent = $widget->{parent}) {
-               $self->{realloc}{$parent+0} = $parent;
-               #unshift @queue, $parent;
-               $parent->{force_size_alloc} = 1;
-               $self->{size_alloc}{$parent+0} = $parent;
-            }
-         }
-
-         delete $self->{realloc}{$widget+0};
-       }
-   }
-
-   while (my $size_alloc = delete $self->{size_alloc}) {
-      my @queue = sort { $b->{visible} <=> $a->{visible} }
-                       values %$size_alloc;
-
-      while () {
-         my $widget = pop @queue || last;
+sub set_items {
+   my ($self, $items) = @_;
 
-         my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
+   $self->{child}->clear;
+   return unless $items;
 
-         $w = 0 if $w < 0;
-         $h = 0 if $h < 0;
+   my @items = sort {
+      ($a->{type} <=> $b->{type})
+         or ($a->{name} cmp $b->{name})
+   } @$items;
 
-         $w = int $w + 0.5;
-         $h = int $h + 0.5;
+   $self->{real_items} = \@items;
 
-         if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
-            $widget->{w} = $w;
-            $widget->{h} = $h;
+   my $row = 0;
+   for my $item (@items) {
+      CFClient::Item::update_widgets $item;
 
-            $widget->emit (size_allocate => $w, $h);
-         }
-      }
-   }
+      $self->{child}->add (0, $row, $item->{face_widget});
+      $self->{child}->add (1, $row, $item->{desc_widget});
+      $self->{child}->add (2, $row, $item->{weight_widget});
 
-   while ($self->{post_alloc_hook}) {
-      $_->()
-         for values %{delete $self->{post_alloc_hook}};
+      $row++;
    }
-
-
-   glViewport 0, 0, $::WIDTH, $::HEIGHT;
-   glClearColor +($::CFG->{fow_intensity}) x 3, 1;
-   glClear GL_COLOR_BUFFER_BIT;
-
-   glMatrixMode GL_PROJECTION;
-   glLoadIdentity;
-   glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
-   glMatrixMode GL_MODELVIEW;
-   glLoadIdentity;
-
-   $self->_draw;
 }
 
 #############################################################################
@@ -3312,7 +3319,12 @@
    $self->set_command_list ($rec);
 }
 
-# if $commit is true, the binding will be set after the user entered a key combo
+
+sub ask_for_bind_and_commit {
+   my ($self) = @_;
+   $self->ask_for_bind (1);
+}
+
 sub ask_for_bind {
    my ($self, $commit) = @_;
 
@@ -3388,6 +3400,7 @@
       $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",
@@ -3396,28 +3409,25 @@
             $cmds->[$i] = undef;
          });
 
-      $hb->add (new CFClient::UI::Label text => $_);
 
       $idx++
    }
 }
 
-
 #############################################################################
 
 package CFClient::UI::SpellList;
 
-our @ISA = CFClient::UI::FancyFrame::;
+our @ISA = CFClient::UI::Table::;
 
 sub new {
    my $class = shift;
 
-   my $self = $class->SUPER::new (binding => [], commands => [], @_);
-
-   $self->add (new CFClient::UI::ScrolledWindow
-      scrolled => $self->{spellbox} = new CFClient::UI::Table);
-
-   $self;
+   my $self = $class->SUPER::new (
+      binding  => [],
+      commands => [],
+      @_,
+   )
 }
 
 # XXX: Do sorting? Argl...
@@ -3425,19 +3435,25 @@
    my ($self, $spell) = @_;
    $self->{spells}->{$spell->{name}} = $spell;
 
-   $self->{spellbox}->add (0, $self->{tbl_idx},   new CFClient::UI::Face
+   $self->add (0, $self->{tbl_idx},   new CFClient::UI::Face
       face => $spell->{face},
       can_hover => 1,
       can_events => 1,
       tooltip => $spell->{message});
 
-   $self->{spellbox}->add (1, $self->{tbl_idx},   new CFClient::UI::Label
+   $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->{spellbox}->add (2, $self->{tbl_idx}++, new CFClient::UI::Button
+
+   $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}"]) });
 }
@@ -3455,6 +3471,234 @@
 }
 
 #############################################################################
+
+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 {
+   my ($self) = @_;
+
+   ($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) = @_;
+
+   for my $child ($self->children) {
+      my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
+
+      $X = $child->{force_x} if exists $child->{force_x};
+      $Y = $child->{force_y} if exists $child->{force_y};
+
+      $X = _to_pixel $X, $W, $self->{w};
+      $Y = _to_pixel $Y, $H, $self->{h};
+
+      $child->configure ($X, $Y, $W, $H);
+   }
+}
+
+sub coord2local {
+   my ($self, $x, $y) = @_;
+
+   ($x, $y)
+}
+
+sub coord2global {
+   my ($self, $x, $y) = @_;
+
+   ($x, $y)
+}
+
+sub update {
+   my ($self) = @_;
+
+   $::WANT_REFRESH++;
+}
+
+sub add {
+   my ($self, @children) = @_;
+
+   $_->{is_toplevel} = 1
+      for @children;
+
+   $self->SUPER::add (@children);
+}
+
+sub remove {
+   my ($self, @children) = @_;
+
+   $self->SUPER::remove (@children);
+
+   delete $self->{is_toplevel}
+      for @children;
+
+   while (@children) {
+      my $w = pop @children;
+      push @children, $w->children;
+      $w->set_invisible;
+   }
+}
+
+sub on_refresh {
+   my ($self, $id, $cb) = @_;
+
+   $self->{refresh_hook}{$id} = $cb;
+}
+
+sub on_post_alloc {
+   my ($self, $id, $cb) = @_;
+
+   $self->{post_alloc_hook}{$id} = $cb;
+}
+
+sub draw {
+   my ($self) = @_;
+
+   while ($self->{refresh_hook}) {
+      $_->()
+         for values %{delete $self->{refresh_hook}};
+   }
+
+   if ($self->{realloc}) {
+      my %queue;
+      my @queue;
+      my $widget;
+
+      outer:
+      while () {
+         if (my $realloc = delete $self->{realloc}) {
+            for $widget (values %$realloc) {
+               $widget->{visible} or next; # do not resize invisible widgets
+
+               $queue{$widget+0}++ and next; # duplicates are common
+
+               push @{ $queue[$widget->{visible}] }, $widget;
+            }
+         }
+
+         while () {
+            @queue or last outer;
+
+            $widget = pop @{ $queue[-1] || [] }
+               and last;
+            
+            pop @queue;
+         }
+
+         delete $queue{$widget+0};
+
+         my ($w, $h) = $widget->size_request;
+
+         $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
+         $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
+
+         $w = $widget->{force_w} if exists $widget->{force_w};
+         $h = $widget->{force_h} if exists $widget->{force_h};
+
+         if ($widget->{req_w} != $w || $widget->{req_h} != $h
+             || delete $widget->{force_realloc}) {
+            $widget->{req_w} = $w;
+            $widget->{req_h} = $h;
+
+            $self->{size_alloc}{$widget+0} = $widget;
+
+            if (my $parent = $widget->{parent}) {
+               $self->{realloc}{$parent+0} = $parent
+                  unless $queue{$parent+0};
+
+               $parent->{force_size_alloc} = 1;
+               $self->{size_alloc}{$parent+0} = $parent;
+            }
+         }
+
+         delete $self->{realloc}{$widget+0};
+       }
+   }
+
+   while (my $size_alloc = delete $self->{size_alloc}) {
+      my @queue = sort { $b->{visible} <=> $a->{visible} }
+                       values %$size_alloc;
+
+      while () {
+         my $widget = pop @queue || last;
+
+         my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
+
+         $w = 0 if $w < 0;
+         $h = 0 if $h < 0;
+
+         $w = int $w + 0.5;
+         $h = int $h + 0.5;
+
+         if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
+            $widget->{old_w} = $widget->{w};
+            $widget->{old_h} = $widget->{h};
+
+            $widget->{w} = $w;
+            $widget->{h} = $h;
+
+            $widget->emit (size_allocate => $w, $h);
+         }
+      }
+   }
+
+   while ($self->{post_alloc_hook}) {
+      $_->()
+         for values %{delete $self->{post_alloc_hook}};
+   }
+
+
+   glViewport 0, 0, $::WIDTH, $::HEIGHT;
+   glClearColor +($::CFG->{fow_intensity}) x 3, 1;
+   glClear GL_COLOR_BUFFER_BIT;
+
+   glMatrixMode GL_PROJECTION;
+   glLoadIdentity;
+   glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
+   glMatrixMode GL_MODELVIEW;
+   glLoadIdentity;
+
+   {
+      package CFClient::UI::Base;
+
+      ($draw_x, $draw_y, $draw_w, $draw_h) =
+         (0, 0, $self->{w}, $self->{h});
+   }
+
+   $self->_draw;
+}
+
+#############################################################################
 
 package CFClient::UI;