--- deliantra/Deliantra-Client/DC/UI.pm	2006/06/01 03:42:58	1.266
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/06/05 01:22:08	1.280
@@ -173,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};
@@ -183,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.]+$/;
 
       }
    }
@@ -373,6 +373,11 @@
 }
 
 sub children {
+   # nop
+}
+
+sub visible_children {
+   $_[0]->children
 }
 
 sub set_max_size {
@@ -380,6 +385,8 @@
 
    delete $self->{max_w}; $self->{max_w} = $w if $w;
    delete $self->{max_h}; $self->{max_h} = $h if $h;
+
+   $self->realloc;
 }
 
 sub set_tooltip {
@@ -441,22 +448,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) = @_;
@@ -528,27 +531,37 @@
    $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;
-   glPopMatrix;
 
    if ($self == $HOVER && $self->{can_hover}) {
-      my ($x, $y) = @$self{qw(x y)};
-
-      glColor 1, 0.8, 0.5, 0.2;
+      glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
       glEnable GL_BLEND;
-      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+      glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
       glBegin GL_QUADS;
-      glVertex $x             , $y;
-      glVertex $x + $self->{w}, $y;
-      glVertex $x + $self->{w}, $y + $self->{h};
-      glVertex $x             , $y + $self->{h};
+      glVertex 0         , 0;
+      glVertex $self->{w}, 0;
+      glVertex $self->{w}, $self->{h};
+      glVertex 0         , $self->{h};
       glEnd;
       glDisable GL_BLEND;
    }
@@ -556,7 +569,7 @@
    if ($ENV{CFPLUS_DEBUG} & 1) {
       glPushMatrix;
       glColor 1, 1, 0, 1;
-      glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
+      glTranslate 0.375, 0.375;
       glBegin GL_LINE_LOOP;
       glVertex 0             , 0;
       glVertex $self->{w} - 1, 0;
@@ -566,6 +579,9 @@
       glPopMatrix;
       #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
    }
+
+   $self->_draw;
+   glPopMatrix;
 }
 
 sub _draw {
@@ -613,8 +629,8 @@
       my ($w, $h) = @$self{qw(w h)};
 
       glEnable GL_BLEND;
-      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-      glColor @$color;
+      glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+      glColor_premultiply @$color;
 
       glBegin GL_QUADS;
       glVertex 0 , 0;
@@ -655,14 +671,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
 }
@@ -720,7 +738,7 @@
 
    my $res;
 
-   for (reverse @{ $self->{children} }) {
+   for (reverse $self->visible_children) {
       $res = $_->find_widget ($x, $y)
          and return $res;
    }
@@ -779,6 +797,8 @@
 
 #############################################################################
 
+# back-buffered drawing area
+
 package CFClient::UI::Window;
 
 our @ISA = CFClient::UI::Bin::;
@@ -806,7 +826,9 @@
 }
 
 sub _render {
-   $_[0]{children}[0]->draw;
+   my ($self) = @_;
+
+   $self->{children}[0]->draw;
 }
 
 sub render_child {
@@ -816,6 +838,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;
    };
 }
@@ -823,14 +852,14 @@
 sub _draw {
    my ($self) = @_;
 
-   my ($w, $h) = ($self->w, $self->h);
+   my ($w, $h) = @$self{qw(w h)};
 
    my $tex = $self->{texture}
       or return;
 
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-   glColor 1, 1, 1, 1;
+   glColor 0, 0, 0, 1;
 
    $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
 
@@ -916,6 +945,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;
@@ -928,7 +960,9 @@
 our @ISA = CFClient::UI::HBox::;
 
 sub new {
-   my $class = shift;
+   my ($class, %arg) = @_;
+
+   my $child = delete $arg{child};
 
    my $self;
 
@@ -943,16 +977,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) = @_;
 
@@ -999,8 +1038,8 @@
       my ($w, $h) = @$self{qw(w h)};
 
       glEnable GL_BLEND;
-      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-      glColor @{ $self->{bg} };
+      glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+      glColor_premultiply @{ $self->{bg} };
 
       glBegin GL_QUADS;
       glVertex 0 , 0;
@@ -1032,7 +1071,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],
@@ -1041,18 +1082,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
 }
@@ -1060,6 +1109,9 @@
 sub size_request {
    my ($self) = @_;
 
+   $self->{title}->size_request
+      if $self->{title};
+
    my ($w, $h) = $self->SUPER::size_request;
 
    (
@@ -1071,13 +1123,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 {
@@ -1106,8 +1163,8 @@
          $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);
+         $self->realloc;
       };
 
    } elsif ($lr ^ $td) {
@@ -1120,27 +1177,37 @@
          ($x, $y) = ($ev->{x}, $ev->{y});
 
          $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
+         # HACK: the next line is required to enforce placement
+         $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
       };
+   } 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;
@@ -1165,9 +1232,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;
+   }
 }
 
 #############################################################################
@@ -1525,6 +1595,8 @@
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
+   delete $self->{ox};
+
    delete $self->{texture}
       unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
 }
@@ -1551,8 +1623,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);
@@ -1560,19 +1634,15 @@
       $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;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
-   if ($tex->{format} == GL_ALPHA) {
-      glColor @{$self->{fg}};
-      $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
-   } else {
-      $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
-   }
+   glColor_premultiply @{$self->{fg}}
+      if $tex->{format} == GL_ALPHA;
+
+   $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
 
    glDisable GL_TEXTURE_2D;
 }
@@ -1609,8 +1679,6 @@
 
    return if $self->{text} eq $text;
 
-   delete $self->{texture};
-
    $self->{last_activity} = $::NOW;
    $self->{text} = $text;
 
@@ -1618,6 +1686,7 @@
    $self->{layout}->set_text ("$text ");
 
    $self->_emit (changed => $self->{text});
+   $self->update;
 }
 
 sub set_text {
@@ -1666,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 {
@@ -1695,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 {
@@ -1708,14 +1785,14 @@
    local $self->{fg} = $self->{fg};
 
    if ($FOCUS == $self) {
-      glColor @{$self->{active_bg}};
+      glColor_premultiply @{$self->{active_bg}};
       $self->{fg} = $self->{active_fg};
    } else {
-      glColor @{$self->{bg}};
+      glColor_premultiply @{$self->{bg}};
    }
 
    glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+   glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
    glBegin GL_QUADS;
    glVertex 0         , 0;
    glVertex 0         , $self->{h};
@@ -1786,9 +1863,10 @@
       }
 
    } else {
-      $self->SUPER::key_down ($ev);
+      return $self->SUPER::key_down ($ev)
    }
 
+   1
 }
 
 #############################################################################
@@ -1827,16 +1905,14 @@
    $self->emit ("activate")
       if $x >= 0 && $x < $self->{w}
          && $y >= 0 && $y < $self->{h};
+
+   1
 }
 
 sub _draw {
    my ($self) = @_;
 
-   local $self->{fg} = $self->{fg};
-
-   if ($GRAB == $self) {
-      $self->{fg} = $self->{active_fg};
-   }
+   local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
 
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
@@ -1890,7 +1966,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 {
@@ -2067,7 +2147,8 @@
    my $h2 = $self->{h} * (1 - $ycut2);
 
    glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+   glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
+                       GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
@@ -2238,7 +2319,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 {
@@ -2252,13 +2333,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}};
@@ -2274,13 +2366,7 @@
 
       $self->{knob_x} = $value - $knob_w * 0.5;
       $self->{knob_w} = $knob_w;
-   });
-
-   $self->SUPER::update;
-}
-
-sub _draw {
-   my ($self) = @_;
+   }
 
    $self->SUPER::_draw ();
 
@@ -2484,7 +2570,7 @@
       }
 
       $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
-         glClearColor 0.5, 0.5, 0.5, 0;
+         glClearColor 0, 0, 0, 0;
          glClear GL_COLOR_BUFFER_BIT;
 
          my $top = int $self->{children}[1]{range}[0];
@@ -2529,8 +2615,8 @@
 
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-   glColor 1, 1, 1, 1;
-   $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
+   glColor 0, 0, 0, 1;
+   $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
    glDisable GL_TEXTURE_2D;
 
    $self->{children}[1]->draw;
@@ -2767,7 +2853,7 @@
    if ($tex) {
       glEnable GL_TEXTURE_2D;
       glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-      glColor 1, 1, 1, 1;
+      glColor 0, 0, 0, 1;
       $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
       glDisable GL_TEXTURE_2D;
    }
@@ -2784,6 +2870,14 @@
 
 #############################################################################
 
+package CFClient::UI::Buttonbar;
+
+our @ISA = CFClient::UI::HBox::;
+
+# TODO: should actualyl wrap buttons and other goodies.
+
+#############################################################################
+
 package CFClient::UI::Menu;
 
 our @ISA = CFClient::UI::FancyFrame::;
@@ -2840,6 +2934,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 {
@@ -2851,7 +2947,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});
 }
 
 #############################################################################
@@ -2863,15 +3071,24 @@
 sub new {
    my $class = shift;
 
-   $class->SUPER::new (
+   my $self = $class->SUPER::new (
       fontsize => 0.8,
       @_,
-   )
+   );
+
+   Scalar::Util::weaken (my $this = $self);
+
+   $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
+      $this->reorder;
+      $this->update;
+   });
+
+   $self
 }
 
 sub reorder {
    my ($self) = @_;
-   my $NOW = time;
+   my $NOW = Time::HiRes::time;
 
    while (my ($k, $v) = each %{ $self->{item} }) {
       delete $self->{item}{$k} if $v->{timeout} < $NOW;
@@ -2884,6 +3101,8 @@
                      or $b->{id} <=> $a->{id}
                } values %{ $self->{item} };
 
+   $self->{timer}->interval (1);
+
    my $count = 10 + 1;
    for my $item (@items) {
       last unless --$count;
@@ -2907,9 +3126,20 @@
             fontsize      => $item->{fontsize} || $self->{fontsize},
             max_w         => $::WIDTH * 0.44,
             fg            => $item->{fg},
+            orig_alpha    => $item->{fg}[3] || 1,
             can_events    => 1,
             can_hover     => 1
       };
+
+      if ((my $diff = $item->{timeout} - $NOW) < 2) {
+         $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
+         if ($diff < 1) {
+            $item->{label}{max_h} = $item->{label}{req_h} * $diff;
+            $item->{label}->realloc;
+         }
+         $item->{label}->update;
+         $self->{timer}->interval (1/30);
+      }
    }
 
    $self->clear;
@@ -2924,7 +3154,7 @@
 
    return unless $text;
 
-   my $timeout = time + ((delete $arg{timeout}) || 60);
+   my $timeout = (int time) + ((delete $arg{timeout}) || 60);
 
    my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
 
@@ -2964,6 +3194,14 @@
    $self->SUPER::reconfigure;
 }
 
+sub DESTROY {
+   my ($self) = @_;
+
+   $self->{timer}->cancel;
+
+   $self->SUPER::DESTROY;
+}
+
 #############################################################################
 
 package CFClient::UI::Inventory;
@@ -2974,7 +3212,7 @@
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
+      child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
       @_,
    );
 
@@ -2984,7 +3222,7 @@
 sub set_items {
    my ($self, $items) = @_;
 
-   $self->{scrolled}->clear;
+   $self->{child}->clear;
    return unless $items;
 
    my @items = sort {
@@ -2998,9 +3236,9 @@
    for my $item (@items) {
       CFClient::Item::update_widgets $item;
 
-      $self->{scrolled}->add (0, $row, $item->{face_widget});
-      $self->{scrolled}->add (1, $row, $item->{desc_widget});
-      $self->{scrolled}->add (2, $row, $item->{weight_widget});
+      $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++;
    }
@@ -3108,7 +3346,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) = @_;
 
@@ -3202,17 +3445,16 @@
 
 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...
@@ -3220,25 +3462,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::Label
+   $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->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
+   $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}"]) });
 }
@@ -3261,6 +3503,8 @@
 
 our @ISA = CFClient::UI::Container::;
 
+use List::Util qw(min max);
+
 use CFClient::OpenGL;
 
 sub new {
@@ -3404,8 +3648,11 @@
 
          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 = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
+         $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
+
+         $w = min $widget->{max_w}, $w if exists $widget->{max_w};
+         $h = min $widget->{max_h}, $h if exists $widget->{max_h};
 
          $w = $widget->{force_w} if exists $widget->{force_w};
          $h = $widget->{force_h} if exists $widget->{force_h};
@@ -3473,6 +3720,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;
 }