--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/09 17:34:15	1.35
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/10 11:41:17	1.51
@@ -7,14 +7,68 @@
 use SDL::OpenGL;
 use SDL::OpenGL::Constants;
 
-our $FOCUS;  # the widget with current focus
-#our @ACTIVE_WIDGETS;
+use Crossfire::Client;
+
+our ($FOCUS, $HOVER, $GRAB); # various widgets
+
+our $TOPLEVEL;
+our $BUTTON_STATE;
 
 # class methods for events
-sub feed_sdl_key_down_event    { $FOCUS->key_down ($_[0])    if $FOCUS }
-sub feed_sdl_key_up_event      { $FOCUS->key_up ($_[0])      if $FOCUS }
-sub feed_sdl_button_down_event { }
-sub feed_sdl_button_up_event   { }
+sub feed_sdl_key_down_event { 
+   $FOCUS->key_down ($_[0]) if $FOCUS;
+}
+
+sub feed_sdl_key_up_event {
+   $FOCUS->key_up ($_[0]) if $FOCUS;
+}
+
+sub feed_sdl_button_down_event {
+   my ($ev) = @_;
+   my ($x, $y) = ($ev->motion_x, $ev->motion_y);
+
+   if (!$BUTTON_STATE) {
+      my $widget = $TOPLEVEL->find_widget ($x, $y);
+
+      $GRAB = $widget;
+      $GRAB->update if $GRAB;
+   }
+
+   $BUTTON_STATE |= 1 << ($ev->button - 1);
+
+   $GRAB->button_down ($ev) if $GRAB;
+}
+
+sub feed_sdl_button_up_event {
+   my ($ev) = @_;
+   my ($x, $y) = ($ev->motion_x, $ev->motion_y);
+
+   my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
+
+   $BUTTON_STATE &= ~(1 << ($ev->button - 1));
+
+   if (!$BUTTON_STATE) {
+      my $grab = $GRAB; undef $GRAB;
+      $grab->update if $grab;
+      $GRAB->update if $GRAB;
+   }
+}
+
+sub feed_sdl_motion_event {
+   my ($ev) = @_;
+   my ($x, $y) = ($ev->motion_x, $ev->motion_y);
+
+   my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
+
+   if ($widget != $HOVER) {
+      my $hover = $HOVER; $HOVER = $widget;
+
+      $hover->update if $hover;
+      $HOVER->update if $HOVER;
+   }
+
+   $HOVER->mouse_motion ($ev) if $HOVER;
+}
 
 sub new {
    my $class = shift;
@@ -22,18 +76,6 @@
    bless { @_ }, $class
 }
 
-#sub activate {
-#   push @ACTIVE_WIDGETS, $_[0];
-#   Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
-#}
-
-#sub deactivate {
-#   @ACTIVE_WIDGETS =
-#      sort { $a->{z} <=> $b->{z} }
-#         grep { $_ && $_ != $_[0] }
-#            @ACTIVE_WIDGETS;
-#}
-
 sub move {
    my ($self, $x, $y, $z) = @_;
    $self->{x} = $x;
@@ -46,39 +88,45 @@
 }
 
 sub size_request {
-   die "size_request is abtract";
+   require Carp;
+   Carp::confess "size_request is abtract";
 }
 
-sub focus_in {
-   my ($widget) = @_;
-   $FOCUS = $widget;
-}
+sub size_allocate {
+   my ($self, $w, $h) = @_;
 
-sub focus_out {
-   my ($widget) = @_;
+   $self->{w} = $w;
+   $self->{h} = $h;
 }
 
-sub key_down {
-   my ($widget, $sdlev) = @_;
-}
+sub focus_in {
+   my ($self) = @_;
 
-sub key_up {
-   my ($widget, $sdlev) = @_;
+   my $focus = $FOCUS; $FOCUS = $self;
+   $focus->update if $focus;
+   $FOCUS->update;
 }
 
-sub button_down {
-   my ($widget, $sdlev) = @_;
-}
+sub focus_out {
+   my ($self) = @_;
 
-sub button_up {
-   my ($widget, $sdlev) = @_;
+   return unless $FOCUS == $self;
+
+   my $focus = $FOCUS; undef $FOCUS;
+   $focus->update if $focus; #?
 }
 
-sub w { $_[0]->{w} }
-sub h { $_[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} }
+sub mouse_motion { }
+sub button_up { }
+sub button_down { }
+sub key_down { }
+sub key_up { }
+
+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} }
 
 sub draw {
    my ($self) = @_;
@@ -86,11 +134,24 @@
    glPushMatrix;
    glTranslate $self->{x}, $self->{y}, 0;
    $self->_draw;
+   if ($self == $HOVER) {
+      glColor 1, 1, 1, 0.4;
+      glEnable GL_BLEND;
+      glBegin GL_QUADS;
+      glVertex 0         , 0;
+      glVertex $self->{w}, 0;
+      glVertex $self->{w}, $self->{h};
+      glVertex 0         , $self->{h};
+      glEnd;
+      glDisable GL_BLEND;
+   }
    glPopMatrix;
 }
 
 sub _draw {
-   my ($widget) = @_;
+   my ($self) = @_;
+
+   warn "no draw defined for $self\n";
 }
 
 sub bbox {
@@ -104,6 +165,16 @@
    )
 }
 
+sub find_widget {
+   my ($self, $x, $y) = @_;
+
+   return $self
+      if $x >= $self->{x} && $x < $self->{x} + $self->{w}
+          && $y >= $self->{y} && $y < $self->{y} + $self->{h};
+
+   ()
+}
+
 sub del_parent { $_[0]->{parent} = undef }
 
 sub set_parent {
@@ -130,113 +201,132 @@
    #$self->deactivate;
 }
 
-package Crossfire::Client::Widget::Bin;
+#############################################################################
+
+package Crossfire::Client::Widget::Container;
 
 our @ISA = Crossfire::Client::Widget::;
 
-sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }
+sub new {
+   my ($class, @widgets) = @_;
 
-sub get { $_[0]->{child} }
+   my $self = $class->SUPER::new (children => []);
+   $self->add ($_) for @widgets;
 
-sub remove {
-   my ($self, $chld) = @_;
-   delete $self->{child}
-      if $self->{child} == $chld;
+   $self
 }
 
-sub size_request {
-   $_[0]->{child}->size_request if $_[0]->{child}
-}
+sub add {
+   my ($self, $chld, $expand) = @_;
 
-sub _draw {
-   my ($self) = @_;
+   $chld->{expand} = $expand;
+   $chld->set_parent ($self);
+
+   @{$self->{children}} =
+      sort { $a->{z} <=> $b->{z} }
+         @{$self->{children}}, $chld;
 
-   $self->{child}->draw;
+   $self->size_allocate ($self->{w}, $self->{h})
+      if $self->{w}; #TODO: check for "realised state"
 }
 
-package Crossfire::Client::Widget::Toplevel;
+sub remove {
+   my ($self, $widget) = @_;
 
-our @ISA = Crossfire::Client::Widget::;
+   $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
 
-use SDL::OpenGL;
+   $self->size_allocate ($self->{w}, $self->{h});
+}
 
-sub add {
-   my ($self, $chld) = @_;
+sub find_widget {
+   my ($self, $x, $y) = @_;
 
-   push @{$self->{childs}}, $chld;
-   @{$self->{childs}} =
-      sort { $a->{z} <=> $b->{z} }
-         @{$self->{childs}};
+   $x -= $self->{x};
+   $y -= $self->{y};
 
-   $chld->set_parent ($self);
-}
+   my $res;
 
-sub remove {
-   my ($self, $chld) = @_;
-   @{$self->{childs}} =
-      sort { $a->{z} <=> $b->{z} }
-         grep { $_ && $_ != $_[0] }
-            @{$self->{childs}}
-}
+   for (reverse @{ $self->{children} }) {
+      $res = $_->find_widget ($x, $y)
+         and return $res;
+   }
 
-sub update {
-   my ($self) = @_;
-   ::refresh ();
+   $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
 }
 
 sub _draw {
    my ($self) = @_;
 
-   $_->draw for @{$self->{childs}};
+   $_->draw for @{$self->{children}};
 }
 
+#############################################################################
+
+package Crossfire::Client::Widget::Bin;
+
+our @ISA = Crossfire::Client::Widget::Container::;
+
+sub child { $_[0]->{children}[0] }
+
+sub size_request {
+   $_[0]{children}[0]->size_request if $_[0]{children}[0];
+}
+
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->SUPER::size_allocate ($w, $h);
+   $self->{children}[0]->size_allocate ($w, $h)
+      if $self->{children}[0]
+}
+
+#############################################################################
+
 package Crossfire::Client::Widget::Window;
 
 our @ISA = Crossfire::Client::Widget::Bin::;
 
 use SDL::OpenGL;
 
-sub add {
-   my ($self, $chld) = @_;
-   $self->SUPER::add ($chld);
-   $chld->set_parent ($self);
-   $self->update; #TODO: Move this to the size_request event propably?
-}
+sub new {
+   my ($class, $x, $y, $z, $w, $h) = @_;
 
-sub remove {
-   my ($self) = @_;
-   # TODO FIXME: removing a child from a window will crash, see render_chld
-   $self->update;
+   my $self = $class->SUPER::new;
+
+   @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
 }
 
 sub update {
    my ($self) = @_;
+
    $self->render_chld;
+   $self->SUPER::update;
 }
 
 sub render_chld {
    my ($self) = @_;
-   my $chld = $self->get;
-   my ($w, $h) = $self->size_request;
 
    $self->{texture} =
       Crossfire::Client::Texture->new_from_opengl (
-         $w, $h, sub { $chld->draw }
+         $self->{w}, $self->{h}, sub { $self->child->draw }
       );
-   $self->{texture}->upload;
 }
 
-sub size_request {
-   my ($self) = @_;
-   my $chld = $self->get
-      or return (0, 0);
-   $chld->size_request
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->{w} = $w;
+   $self->{h} = $h;
+
+   $self->child->size_allocate ($w, $h);
+
+   $self->render_chld;
 }
 
 sub _draw {
    my ($self) = @_;
 
-   my ($w, $h) = $self->size_request;#TODO# use width/height of texture
+   my ($w, $h) = ($self->w, $self->h);
 
    my $tex = $self->{texture}
       or return;
@@ -257,6 +347,8 @@
    glDisable GL_TEXTURE_2D;
 }
 
+#############################################################################
+
 package Crossfire::Client::Widget::Frame;
 
 our @ISA = Crossfire::Client::Widget::Bin::;
@@ -265,7 +357,7 @@
 
 sub size_request {
    my ($self) = @_;
-   my $chld = $self->get
+   my $chld = $self->child
       or return (0, 0);
 
    $chld->move (2, 2);
@@ -273,10 +365,20 @@
    map { $_ + 4 } $chld->size_request;
 }
 
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+   
+   $self->{w} = $w;
+   $self->{h} = $h;
+
+   $self->child->size_allocate ($w - 4, $h - 4);
+   $self->child->move (2, 2);
+}
+
 sub _draw {
    my ($self) = @_;
 
-   my $chld = $self->get;
+   my $chld = $self->child;
 
    my ($w, $h) = $chld->size_request;
 
@@ -291,121 +393,124 @@
    $chld->draw;
 }
 
+#############################################################################
+
 package Crossfire::Client::Widget::FancyFrame;
 
-our @ISA = Crossfire::Client::Widget::Frame::;
+our @ISA = Crossfire::Client::Widget::Bin::;
 
 use SDL::OpenGL;
 
-sub new {
-   my ($self, $theme) = @_;
-   $self = $self->SUPER::new;
-
-   $self->{txts} = [
+my @tex = 
       map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
-         qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/
-   ];
-   $self
-
-}
+         qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
 
 sub size_request {
    my ($self) = @_;
-   my ($w, $h) = $self->get->size_request;
 
-   $h += $self->{txts}->[1]->{height};
-   $h += $self->{txts}->[4]->{height};
-   $w += $self->{txts}->[2]->{width};
-   $w += $self->{txts}->[3]->{width};
+   my ($w, $h) = $self->SUPER::size_request;
 
-   $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
+   $h += $tex[1]->{height};
+   $h += $tex[4]->{height};
+   $w += $tex[2]->{width};
+   $w += $tex[3]->{width};
 
    ($w, $h)
 }
 
-sub _draw {
-   my ($self) = @_;
-
-   my ($w, $h) = $self->size_request;
-   my ($cw, $ch) = $self->get->size_request;
-
-   glEnable GL_BLEND;
-   glEnable GL_TEXTURE_2D;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+sub size_allocate {
+   my ($self, $w, $h) = @_;
 
+   $self->SUPER::size_allocate ($w, $h);
 
-   my $top = $self->{txts}->[1];
-      glBindTexture GL_TEXTURE_2D, $top->{name};
+   $h -= $tex[1]->{height};
+   $h -= $tex[4]->{height};
+   $w -= $tex[2]->{width};
+   $w -= $tex[3]->{width};
 
-      glColor 1, 1, 1, 0.8;
+   $h = $h < 0 ? 0 : $h;
+   $w = $w < 0 ? 0 : $w;
 
-      glBegin GL_QUADS;
-      glTexCoord 0, 0; glVertex 0            , 0;
-      glTexCoord 0, 1; glVertex 0            , $top->{height};
-      glTexCoord 1, 1; glVertex $w           , $top->{height};
-      glTexCoord 1, 0; glVertex $w           , 0;
-      glEnd;
+   $self->child->size_allocate ($w, $h);
+   $self->child->move ($tex[3]->{width}, $tex[1]->{height});
+}
 
-   my $left = $self->{txts}->[3];
-      glBindTexture GL_TEXTURE_2D, $left->{name};
+sub _draw {
+   my ($self) = @_;
 
-      glColor 1, 1, 1, 0.8;
+   my ($w, $h) = ($self->{w}, $self->{h});
+   my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
 
-      glBegin GL_QUADS;
-      glTexCoord 0, 0; glVertex 0            ,  $top->{height};
-      glTexCoord 0, 1; glVertex 0            ,  $top->{height} + $ch;
-      glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
-      glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
-      glEnd;
+   glEnable GL_BLEND;
+   glEnable GL_TEXTURE_2D;
+   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
-   my $right = $self->{txts}->[2];
-      glBindTexture GL_TEXTURE_2D, $right->{name};
+   my $top = $tex[1];
+   glBindTexture GL_TEXTURE_2D, $top->{name};
 
-      glColor 1, 1, 1, 0.8;
+   glBegin GL_QUADS;
+   glTexCoord 0, 0; glVertex 0            , 0;
+   glTexCoord 0, 1; glVertex 0            , $top->{height};
+   glTexCoord 1, 1; glVertex $w           , $top->{height};
+   glTexCoord 1, 0; glVertex $w           , 0;
+   glEnd;
 
-      glBegin GL_QUADS;
-      glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
-      glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
-      glTexCoord 1, 1; glVertex $w                  , $top->{height} + $ch;
-      glTexCoord 1, 0; glVertex $w                  , $top->{height};
-      glEnd;
+   my $left = $tex[3];
+   glBindTexture GL_TEXTURE_2D, $left->{name};
 
-   my $bottom = $self->{txts}->[4];
-      glBindTexture GL_TEXTURE_2D, $bottom->{name};
+   glBegin GL_QUADS;
+   glTexCoord 0, 0; glVertex 0            ,  $top->{height};
+   glTexCoord 0, 1; glVertex 0            ,  $top->{height} + $ch;
+   glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
+   glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
+   glEnd;
 
-      glColor 1, 1, 1, 0.8;
+   my $right = $tex[2];
+   glBindTexture GL_TEXTURE_2D, $right->{name};
 
-      glBegin GL_QUADS;
-      glTexCoord 0, 0; glVertex 0            , $h - $bottom->{height};
-      glTexCoord 0, 1; glVertex 0            , $h;
-      glTexCoord 1, 1; glVertex $w           , $h;
-      glTexCoord 1, 0; glVertex $w           , $h - $bottom->{height};
-      glEnd;
+   glBegin GL_QUADS;
+   glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
+   glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
+   glTexCoord 1, 1; glVertex $w                  , $top->{height} + $ch;
+   glTexCoord 1, 0; glVertex $w                  , $top->{height};
+   glEnd;
 
-   my $bg = $self->{txts}->[0];
-      glBindTexture GL_TEXTURE_2D, $bg->{name};
-      glTexParameter  GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
-      glTexParameter  GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
+   my $bottom = $tex[4];
+   glBindTexture GL_TEXTURE_2D, $bottom->{name};
 
-      glColor 1, 1, 1, 0.8;
+   glBegin GL_QUADS;
+   glTexCoord 0, 0; glVertex 0            , $h - $bottom->{height};
+   glTexCoord 0, 1; glVertex 0            , $h;
+   glTexCoord 1, 1; glVertex $w           , $h;
+   glTexCoord 1, 0; glVertex $w           , $h - $bottom->{height};
+   glEnd;
 
-      my $rep_x = $cw / $bg->{width};
-      my $rep_y = $ch / $bg->{height};
+   my $bg = $tex[0];
+   glBindTexture GL_TEXTURE_2D, $bg->{name};
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+   glTexParameter  GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
+   glTexParameter  GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
 
-      glBegin GL_QUADS;
-      glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
-      glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
-      glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
-      glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
-      glEnd;
+   my $rep_x = $cw / $bg->{width};
+   my $rep_y = $ch / $bg->{height};
 
-   $self->get->draw;
+   glBegin GL_QUADS;
+   glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
+   glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
+   glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
+   glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
+   glEnd;
 
    glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
+
+   $self->child->draw;
+
 }
 
+#############################################################################
+
 package Crossfire::Client::Widget::Table;
 
 our @ISA = Crossfire::Client::Widget::Bin::;
@@ -414,9 +519,9 @@
 
 sub add {
    my ($self, $x, $y, $chld) = @_;
-   my $old_chld = $self->{childs}[$y][$x];
+   my $old_chld = $self->{children}[$y][$x];
 
-   $self->{childs}[$y][$x] = $chld;
+   $self->{children}[$y][$x] = $chld;
    $chld->set_parent ($self);
    $self->update;
 }
@@ -425,8 +530,8 @@
    my ($self, $row) = @_;
 
    my $hs = 0;
-   for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) {
-      my $c = $self->{childs}->[$row]->[$xi];
+   for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
+      my $c = $self->{children}->[$row]->[$xi];
       if ($c) {
          my ($w, $h) = $c->size_request;
          if ($hs < $h) { $hs = $h }
@@ -439,8 +544,8 @@
    my ($self, $col) = @_;
 
    my $ws = 0;
-   for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) {
-      my $c = ($self->{childs}->[$yi] || [])->[$col];
+   for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
+      my $c = ($self->{children}->[$yi] || [])->[$col];
       if ($c) {
          my ($w, $h) = $c->size_request;
          if ($ws < $w) { $ws = $w }
@@ -454,13 +559,13 @@
 
    my ($hs, $ws) = (0, 0);
 
-   for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
+   for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
       $hs += $self->max_row_height ($yi);
    }
 
-   for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
+   for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
       my $wm = 0;
-      for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
+      for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
          $wm += $self->max_col_width ($xi)
       }
       if ($ws < $wm) { $ws = $wm }
@@ -473,12 +578,12 @@
    my ($self) = @_;
 
    my $y = 0;
-   for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
+   for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
       my $x = 0;
 
-      for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
+      for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
 
-         my $c = $self->{childs}->[$yi]->[$xi];
+         my $c = $self->{children}->[$yi]->[$xi];
          if ($c) {
             $c->move ($x, $y, 0); #TODO: Move to size_request
             $c->draw if $c;
@@ -491,44 +596,68 @@
    }
 }
 
+#############################################################################
+
 package Crossfire::Client::Widget::VBox;
 
-our @ISA = Crossfire::Client::Widget::Bin::;
+our @ISA = Crossfire::Client::Widget::Container::;
 
 use SDL::OpenGL;
 
-sub add {
-   my ($self, $chld) = @_;
-   push @{$self->{childs}}, $chld;
-   $chld->set_parent ($self);
-   $self->update;
-}
-
 sub size_request {
    my ($self) = @_;
 
-   my ($hs, $ws) = (0, 0);
-   for (@{$self->{childs} || []}) {
-      my ($w, $h) = $_->size_request;
-      $hs += $h;
-      if ($ws < $w) { $ws = $w }
-   }
+   my @alloc = map [$_->size_request], @{$self->{children}};
 
-   return ($ws, $hs);
+   (
+      (List::Util::max map $_->[0], @alloc),
+      (List::Util::sum map $_->[1], @alloc),
+   )
 }
 
-sub _draw {
-   my ($self) = @_;
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->w ($w);
+   $self->h ($h);
 
-   my ($x, $y);
-   for (@{$self->{childs} || []}) {
-      $_->move (0, $y, 0); #TODO: move to size_request
-      $_->draw;
+   my $exp;
+   my @oth;
+   # find expand widget
+   for (@{$self->{children}}) {
+      if ($_->{expand}) {
+         $exp = $_;
+         last;
+      }
+      push @oth, $_;
+   }
+
+   my ($ow, $oh);
+
+   # get sizes of other widgets
+   for (@oth) {
       my ($w, $h) = $_->size_request;
-      $y += $h;
+      $oh += $h;
+      if ($ow < $w) { $ow = $w }
+   }
+
+   my $y = 0;
+   for (@{$self->{children}}) {
+      $_->move (0, $y);
+
+      if ($_ == $exp) {
+         $_->size_allocate ($w, $h - $oh);
+         $y += $h - $oh;
+      } else {
+         my ($cw, $h) = $_->size_request;
+         $_->size_allocate ($w, $h);
+         $y += $h;
+      }
    }
 }
 
+#############################################################################
+
 package Crossfire::Client::Widget::Label;
 
 our @ISA = Crossfire::Client::Widget::;
@@ -538,6 +667,8 @@
 sub new {
    my ($class, $x, $y, $z, $height, $text) = @_;
 
+   $height ||= $::FONTSIZE;
+
    # TODO: color, and make height, xyz etc. optional
    my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
 
@@ -564,10 +695,17 @@
 sub size_request {
    my ($self) = @_;
 
-   (
-      $self->{texture}{width},
-      $self->{texture}{height},
-   )
+   if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
+      (
+         $self->{texture}{width},
+         $self->{texture}{height},
+      )
+   } else {
+      my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height};
+
+      ($w, $h)
+   }
+
 }
 
 sub _draw {
@@ -581,7 +719,7 @@
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
    glBindTexture GL_TEXTURE_2D, $tex->{name};
 
-   glColor 1, 1, 1, 0.6; # TODO color
+   glColor 1, 0, 0, 1; # TODO color
 
    glBegin GL_QUADS;
    glTexCoord 0, 0; glVertex 0            , 0;
@@ -594,7 +732,9 @@
    glDisable GL_TEXTURE_2D;
 }
 
-package Crossfire::Client::Widget::TextEntry;
+#############################################################################
+
+package Crossfire::Client::Widget::Entry;
 
 our @ISA = Crossfire::Client::Widget::Label::;
 
@@ -607,109 +747,47 @@
    my $mod = $ev->key_mod;
    my $sym = $ev->key_sym;
 
-   $ev->set_unicode (1);
    my $uni = $ev->key_unicode;
 
    my $text = $self->get_text;
 
    if ($sym == SDLK_BACKSPACE) {
       substr $text, -1, 1, '';
-
    } elsif ($uni) {
       $text .= chr $uni;
+      print "$uni <$text>\n";#d#
    }
-   $self->set_text ($text);
-}
-
-
-# XXX: TextView isn't neccessary with pango multiline text rendering
-package Crossfire::Client::Widget::TextView;
-
-use strict;
-
-our @ISA = qw/Crossfire::Client::Widget/;
-
-use SDL::OpenGL;
-use SDL::OpenGL::Constants;
-
-sub new {
-   my ($class, $text, $h) = @_;
-   my $self = $class->SUPER::new ();
 
-   $self->{txt_height} = $h;
-   @{$self->{lines}} = split /\r?\n/, $text;
-
-   for (split /\r?\n/, $text) {
-      $self->add_line ($_);
-   }
-   $self
+   $self->set_text ($text);
 }
 
-#sub render_lines {
-#   my ($self) = @_;
-#
-#   $self->{txt_lines} = [];
-#
-#   for (@{$self->{lines}}) {
-#      push @{$self->{txt_lines}},
-#         new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
-#   }
-#}
-
-sub add_line {
-   my ($self, $line) = @_;
-   push @{$self->{lines}}, $line;
+sub button_down {
+   my ($self, $ev) = @_;
 
-   push @{$self->{txt_lines}},
-     new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
+   $self->focus_in;
 }
 
-sub size_request {
+sub _draw {
    my ($self) = @_;
 
-   my $w = 0;
-   my $h = 0;
-
-   for (@{$self->{txt_lines}}) {
-      if ($w < $_->{width}) { $w = $_->{width} }
-      $h += $_->{height};
+   if ($FOCUS == $self) {
+      glColor 1, 1, 1;
+   } else {
+      glColor 0.7, 0.7, 0.7;
    }
 
-   return ($w, $h);
-}
-
-sub draw_line {
-   my ($self, $tex, $y) = @_;
-
-   glBindTexture GL_TEXTURE_2D, $tex->{name};
-
-   glColor 1, 0, 1;
-
    glBegin GL_QUADS;
-   glTexCoord 0, 0; glVertex 0            , $y;
-   glTexCoord 0, 1; glVertex 0            , $y + $tex->{height};
-   glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
-   glTexCoord 1, 0; glVertex $tex->{width}, $y;
+   glVertex 0             , 0;
+   glVertex 0             , $self->{h} - 1;
+   glVertex $self->{w} - 1, $self->{h} - 1;
+   glVertex $self->{w} - 1, 0;
    glEnd;
-}
-
-sub _draw {
-   my ($self) = @_;
-
-   glEnable GL_BLEND;
-   glEnable GL_TEXTURE_2D;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
 
-   my $l = 0;
-   for (@{$self->{txt_lines}}) {
-      $self->draw_line ($_, $l);
-      $l += $_->{height};
-   }
-
-   glDisable GL_BLEND;
-   glDisable GL_TEXTURE_2D;
+   $self->SUPER::_draw;
 }
 
+#############################################################################
+
 package Crossfire::Client::Widget::MapWidget;
 
 use strict;
@@ -729,6 +807,13 @@
 sub key_up {
 }
 
+sub size_request {
+
+}
+
+sub size_allocate {
+}
+
 sub _draw {
    my ($self) = @_;
 
@@ -878,6 +963,8 @@
    }
 }
 
+#############################################################################
+
 package Crossfire::Client::Widget::Animator;
 
 use SDL::OpenGL;
@@ -888,7 +975,7 @@
    my ($self, $x, $y) = @_;
 
    $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
-   $self->{speed}  = 0.01;
+   $self->{speed}  = 2;
    $self->{time}   = 1;
    
    ::animation_start $self;
@@ -913,10 +1000,56 @@
    my ($self) = @_;
 
    glPushMatrix;
-   glRotate $self->{time} * 10000, 0, 1, 0;
-   $self->{child}->draw;
+   glRotate $self->{time} * 1000, 0, 1, 0;
+   $self->{children}[0]->draw;
    glPopMatrix;
 }
 
-1;
+#############################################################################
+
+package Crossfire::Client::Widget::Toplevel;
+
+our @ISA = Crossfire::Client::Widget::Container::;
+
+sub size_request {
+   ($::WIDTH, $::HEIGHT)
+}
+
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->SUPER::size_allocate ($w, $h);
+
+   $_->size_allocate ($_->size_request)
+      for @{$self->{children}};
+}
+
+sub update {
+   my ($self) = @_;
+
+   $self->size_allocate ($self->size_request);
+   ::refresh ();
+}
+
+sub add {
+   my ($self, $widget) = @_;
+
+   $self->SUPER::add ($widget);
+
+   $widget->size_allocate ($widget->size_request);
+}
+
+sub draw  {
+   my ($self) = @_;
+
+   $self->_draw;
+}
+
+#############################################################################
+
+package Crossfire::Client::Widget;
+
+$TOPLEVEL = new Crossfire::Client::Widget::Toplevel;
+
+1