--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/09 21:50:21	1.41
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/11 14:36:59	1.67
@@ -1,4 +1,4 @@
-package Crossfire::Client::Widget;
+package CFClient::Widget;
 
 use strict;
 
@@ -7,20 +7,80 @@
 use SDL::OpenGL;
 use SDL::OpenGL::Constants;
 
-use Crossfire::Client;
+use CFClient;
 
-our $FOCUS;  # the widget with current focus
+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, $GRAB->translate ($x, $y)) 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));
+
+   $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
+
+   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, $HOVER->translate ($x, $y)) if $HOVER;
+}
 
 sub new {
    my $class = shift;
 
-   bless { @_ }, $class
+   bless {
+      x => 0,
+      y => 0,
+      z => 0,
+      @_
+   }, $class
 }
 
 sub move {
@@ -46,36 +106,41 @@
    $self->{h} = $h;
 }
 
-sub focus_in {
-   my ($widget) = @_;
-   $FOCUS = $widget;
-}
+# translate global koordinates to local coordinate system
+sub translate {
+   my ($self, $x, $y) = @_;
 
-sub focus_out {
-   my ($widget) = @_;
+   $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
 }
 
-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} = $_[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 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) = @_;
@@ -83,6 +148,17 @@
    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;
 }
 
@@ -141,15 +217,29 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::Container;
+package CFClient::Widget::Empty;
 
-our @ISA = Crossfire::Client::Widget::;
+our @ISA = CFClient::Widget::;
+
+sub size_request {
+   (0, 0)
+}
+
+sub draw { }
+
+#############################################################################
+
+package CFClient::Widget::Container;
+
+our @ISA = CFClient::Widget::;
 
 sub new {
-   my ($class, @widgets) = @_;
+   my ($class, %arg) = @_;
 
-   my $self = $class->SUPER::new (children => []);
-   $self->add ($_) for @widgets;
+   my $children = delete $arg{children} || [];
+
+   my $self = $class->SUPER::new (children => [], %arg);
+   $self->add ($_) for @$children;
 
    $self
 }
@@ -160,11 +250,13 @@
    $chld->{expand} = $expand;
    $chld->set_parent ($self);
 
-   @{$self->{children}} =
+   $self->{children} = [
       sort { $a->{z} <=> $b->{z} }
-         @{$self->{children}}, $chld;
+         @{$self->{children}}, $chld
+   ];
 
-   $self->size_allocate ($self->{w}, $self->{h});
+   $self->size_allocate ($self->{w}, $self->{h})
+      if $self->{w}; #TODO: check for "realised state"
 }
 
 sub remove {
@@ -178,40 +270,55 @@
 sub find_widget {
    my ($self, $x, $y) = @_;
 
+   $x -= $self->{x};
+   $y -= $self->{y};
+
    my $res;
 
-   for (@{ $self->{children} }) {
+   for (reverse @{ $self->{children} }) {
       $res = $_->find_widget ($x, $y)
          and return $res;
    }
 
-   ()
+   $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
 }
 
-sub size_request {
+sub _draw {
    my ($self) = @_;
 
-   my ($hs, $ws) = (0, 0);
-   for (@{$self->{children} || []}) {
-      my ($w, $h) = $_->size_request;
-      $hs += $h;
-      if ($ws < $w) { $ws = $w }
-   }
+   $_->draw for @{$self->{children}};
+}
 
-   return ($ws, $hs);
+#############################################################################
+
+package CFClient::Widget::Bin;
+
+our @ISA = CFClient::Widget::Container::;
+
+sub new {
+   my ($class, %arg) = @_;
+
+   my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
+
+   $class->SUPER::new (children => [$child], %arg)
 }
 
-sub _draw {
-   my ($self) = @_;
+sub add {
+   my ($self, $widget) = @_;
 
-   $_->draw for @{$self->{children}};
+   $self->{children} = [];
+   
+   $self->SUPER::add ($widget);
 }
 
-#############################################################################
+sub remove {
+   my ($self, $widget) = @_;
 
-package Crossfire::Client::Widget::Bin;
+   $self->SUPER::remove ($widget);
 
-our @ISA = Crossfire::Client::Widget::Container::;
+   $self->{children} = [new CFClient::Widget::Empty]
+      unless @{$self->{children}};
+}
 
 sub child { $_[0]->{children}[0] }
 
@@ -221,6 +328,7 @@
 
 sub size_allocate {
    my ($self, $w, $h) = @_;
+
    $self->SUPER::size_allocate ($w, $h);
    $self->{children}[0]->size_allocate ($w, $h)
       if $self->{children}[0]
@@ -228,70 +336,44 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::Toplevel;
-
-our @ISA = Crossfire::Client::Widget::Container::;
+package CFClient::Widget::Window;
 
-sub update {
-   my ($self) = @_;
-
-   ::refresh ();
-}
-
-#############################################################################
-
-package Crossfire::Client::Widget::Window;
-
-our @ISA = Crossfire::Client::Widget::Bin::;
+our @ISA = CFClient::Widget::Bin::;
 
 use SDL::OpenGL;
 
-sub add {
-   my ($self, $chld) = @_;
-   warn "ADD $chld\n";
-   $self->SUPER::add ($chld);
-   $chld->set_parent ($self);
-}
+sub new {
+   my ($class, %arg) = @_;
 
-sub remove {
-   my ($self) = @_;
-   # TODO FIXME: removing a child from a window will crash, see render_chld
-   # $self->update;
+   my $self = $class->SUPER::new (%arg);
 }
 
 sub update {
    my ($self) = @_;
+
+   # we want to do this delayed...
    $self->render_chld;
+   $self->SUPER::update;
 }
 
 sub render_chld {
    my ($self) = @_;
-   my $chld = $self->get;
-   my ($w, $h) = $self->size_request;
 
-   require Carp;
-   Carp::cluck "RENDERCHI $w $h";
-   warn "RENDERCHI $w $h\n";
    $self->{texture} =
-      Crossfire::Client::Texture->new_from_opengl (
-         $w, $h, sub { $chld->draw }
+      CFClient::Texture->new_from_opengl (
+         $self->{w}, $self->{h}, sub { $self->child->draw }
       );
-   $self->{texture}->upload;
-}
-
-sub size_request {
-   my ($self) = @_;
-   ($self->w, $self->h)
 }
 
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
-   $self->w ($w);
-   $self->h ($h);
-   $self->get->size_allocate ($w, $h);
+   $self->{w} = $w;
+   $self->{h} = $h;
+
+   $self->child->size_allocate ($w, $h);
 
-   $self->update; #TODO: Move this to the size_request event propably?
+   $self->render_chld;
 }
 
 sub _draw {
@@ -305,14 +387,8 @@
    glEnable GL_BLEND;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-   glBindTexture GL_TEXTURE_2D, $tex->{name};
 
-   glBegin GL_QUADS;
-   glTexCoord 0, 0; glVertex  0,  0;
-   glTexCoord 0, 1; glVertex  0, $h;
-   glTexCoord 1, 1; glVertex $w, $h;
-   glTexCoord 1, 0; glVertex $w,  0;
-   glEnd;
+   $tex->draw_quad (0, 0, $w, $h);
 
    glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
@@ -320,9 +396,9 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::Frame;
+package CFClient::Widget::Frame;
 
-our @ISA = Crossfire::Client::Widget::Bin::;
+our @ISA = CFClient::Widget::Bin::;
 
 use SDL::OpenGL;
 
@@ -338,8 +414,9 @@
 
 sub size_allocate {
    my ($self, $w, $h) = @_;
-
-   $self->SUPER::size_allocate ($w, $h);
+   
+   $self->{w} = $w;
+   $self->{h} = $h;
 
    $self->child->size_allocate ($w - 4, $h - 4);
    $self->child->move (2, 2);
@@ -354,10 +431,10 @@
 
    glBegin GL_QUADS;
    glColor 0, 0, 0;
-   glTexCoord 0, 0; glVertex 0      , 0;
-   glTexCoord 0, 1; glVertex 0      , $h + 4;
-   glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
-   glTexCoord 1, 0; glVertex $w + 4 , 0;
+   glVertex 0      , 0;
+   glVertex 0      , $h + 4;
+   glVertex $w + 4 , $h + 4;
+   glVertex $w + 4 , 0;
    glEnd;
 
    $chld->draw;
@@ -365,14 +442,14 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::FancyFrame;
+package CFClient::Widget::FancyFrame;
 
-our @ISA = Crossfire::Client::Widget::Bin::;
+our @ISA = CFClient::Widget::Bin::;
 
 use SDL::OpenGL;
 
 my @tex = 
-      map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
          qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
 
 sub size_request {
@@ -400,16 +477,18 @@
 
    $h = $h < 0 ? 0 : $h;
    $w = $w < 0 ? 0 : $w;
-   warn "CHILD:$w $h\n";
-   $self->child->size_allocate ($w, $h);
-   $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
+
+   my $child = $self->child;
+
+   $child->size_allocate ($w, $h);
+   $child->move ($tex[3]->{width}, $tex[1]->{height});
 }
 
 sub _draw {
    my ($self) = @_;
 
-   my ($w, $h) = ($self->w, $self->h);
-   my ($cw, $ch) = ($self->child->w, $self->child->h);
+   my ($w, $h) = ($self->{w}, $self->{h});
+   my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
 
    glEnable GL_BLEND;
    glEnable GL_TEXTURE_2D;
@@ -417,44 +496,16 @@
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
    my $top = $tex[1];
-   glBindTexture GL_TEXTURE_2D, $top->{name};
-
-   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;
+   $top->draw_quad (0, 0, $w, $top->{height});
 
    my $left = $tex[3];
-   glBindTexture GL_TEXTURE_2D, $left->{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;
+   $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
 
    my $right = $tex[2];
-   glBindTexture GL_TEXTURE_2D, $right->{name};
-
-   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;
+   $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
 
    my $bottom = $tex[4];
-   glBindTexture GL_TEXTURE_2D, $bottom->{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;
+   $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
 
    my $bg = $tex[0];
    glBindTexture GL_TEXTURE_2D, $bg->{name};
@@ -465,12 +516,7 @@
    my $rep_x = $cw / $bg->{width};
    my $rep_y = $ch / $bg->{height};
 
-   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;
+   $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
 
    glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
@@ -481,9 +527,9 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::Table;
+package CFClient::Widget::Table;
 
-our @ISA = Crossfire::Client::Widget::Bin::;
+our @ISA = CFClient::Widget::Bin::;
 
 use SDL::OpenGL;
 
@@ -568,12 +614,23 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::VBox;
+package CFClient::Widget::VBox;
 
-our @ISA = Crossfire::Client::Widget::Container::;
+our @ISA = CFClient::Widget::Container::;
 
 use SDL::OpenGL;
 
+sub size_request {
+   my ($self) = @_;
+
+   my @alloc = map [$_->size_request], @{$self->{children}};
+
+   (
+      (List::Util::max map $_->[0], @alloc),
+      (List::Util::sum map $_->[1], @alloc),
+   )
+}
+
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
@@ -615,31 +672,27 @@
    }
 }
 
-sub _draw {
-   my ($self) = @_;
-
-   my ($x, $y);
-   for (@{$self->{children} || []}) {
-      $_->draw;
-      $y += $_->h;
-   }
-}
-
 #############################################################################
 
-package Crossfire::Client::Widget::Label;
+package CFClient::Widget::Label;
 
-our @ISA = Crossfire::Client::Widget::;
+our @ISA = CFClient::Widget::;
 
 use SDL::OpenGL;
 
 sub new {
-   my ($class, $x, $y, $z, $height, $text) = @_;
+   my ($class, %arg) = @_;
 
    # TODO: color, and make height, xyz etc. optional
-   my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
+   my $self = $class->SUPER::new (
+      color  => [1, 1, 1],
+      height => $::FONTSIZE,
+      text   => "",
+      layout => new CFClient::Layout,
+      %arg
+   );
 
-   $self->set_text ($text);
+   $self->set_text ($self->{text});
 
    $self
 }
@@ -648,9 +701,9 @@
    my ($self, $text) = @_;
 
    $self->{text} = $text;
-   $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
+   $self->{layout}->set_markup ($text);
 
-   $self->update;
+   delete $self->{texture};
 }
 
 sub get_text {
@@ -662,31 +715,44 @@
 sub size_request {
    my ($self) = @_;
 
-   (
-      $self->{texture}{width},
-      $self->{texture}{height},
-   )
+   $self->{layout}->set_width;
+   $self->{layout}->set_height ($self->{height});
+   $self->{layout}->size
+#   if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
+#      (
+#         $self->{texture}{width},
+#         $self->{texture}{height},
+#      )
+#   } else {
+#      my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
+#   
+#      ($w, $h)
+#   }
+}
+
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->SUPER::size_allocate ($w, $h);
+   delete $self->{texture};
 }
 
 sub _draw {
    my ($self) = @_;
 
-   my $tex = $self->{texture};
+   my $tex = $self->{texture} ||= do {
+      $self->{layout}->set_width ($self->{w});
+      new_from_layout CFClient::Texture $self->{layout};
+   };
 
    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;
-   glBindTexture GL_TEXTURE_2D, $tex->{name};
 
-   glColor 1, 0, 0, 1; # TODO color
+   glColor @{$self->{color}};
 
-   glBegin GL_QUADS;
-   glTexCoord 0, 0; glVertex 0            , 0;
-   glTexCoord 0, 1; glVertex 0            , $tex->{height};
-   glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
-   glTexCoord 1, 0; glVertex $tex->{width}, 0;
-   glEnd;
+   $tex->draw_quad (0, 0);
 
    glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
@@ -694,9 +760,9 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::TextEntry;
+package CFClient::Widget::Entry;
 
-our @ISA = Crossfire::Client::Widget::Label::;
+our @ISA = CFClient::Widget::Label::;
 
 use SDL;
 use SDL::OpenGL;
@@ -707,23 +773,52 @@
    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;
    }
+
    $self->set_text ($text);
 }
 
+sub button_down {
+   my ($self, $ev) = @_;
+
+   $self->focus_in;
+}
+
+sub mouse_motion {
+   my ($self, $ev, $x, $y) = @_;
+   printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   if ($FOCUS == $self) {
+      glColor 1, 1, 1;
+   } else {
+      glColor 0.7, 0.7, 0.7;
+   }
+
+   glBegin GL_QUADS;
+   glVertex 0             , 0;
+   glVertex 0             , $self->{h} - 1;
+   glVertex $self->{w} - 1, $self->{h} - 1;
+   glVertex $self->{w} - 1, 0;
+   glEnd;
+
+   $self->SUPER::_draw;
+}
+
 #############################################################################
 
-package Crossfire::Client::Widget::MapWidget;
+package CFClient::Widget::MapWidget;
 
 use strict;
 
@@ -733,7 +828,17 @@
 use SDL::OpenGL;
 use SDL::OpenGL::Constants;
 
-our @ISA = Crossfire::Client::Widget::;
+our @ISA = CFClient::Widget::;
+
+sub new {
+   my $class = shift;
+
+   $class->SUPER::new (
+      z    => -1,
+      list => (glGenLists 1),
+      @_
+   )
+}
 
 sub key_down {
    print "MAPKEYDOWN\n";
@@ -743,76 +848,77 @@
 }
 
 sub size_request {
-
+   (
+      1 + int $::WIDTH  / 32,
+      1 + int $::HEIGHT / 32,
+   )
 }
 
-sub size_allocate {
+sub update {
+   my ($self) = @_;
+
+   $self->{need_update} = 1;
 }
 
 sub _draw {
    my ($self) = @_;
 
-   my $mx = $::CONN->{mapx};
-   my $my = $::CONN->{mapy};
+   if (delete $self->{need_update}) {
+      glNewList $self->{list}, GL_COMPILE;
 
-   my $map = $::CONN->{map};
+      my $mx = $::CONN->{mapx};
+      my $my = $::CONN->{mapy};
 
-   my ($xofs, $yofs);
+      my $map = $::CONN->{map};
 
-   my $sw = 1 + int $::WIDTH  / 32;
-   my $sh = 1 + int $::HEIGHT / 32;
+      my ($xofs, $yofs);
 
-   if ($::CONN->{mapw} > $sw) {
-      $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
-   } else {
-      $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
-   }
+      my $sw = 1 + int $::WIDTH  / 32;
+      my $sh = 1 + int $::HEIGHT / 32;
 
-   if ($::CONN->{maph} > $sh) {
-      $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
-   } else {
-      $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
-   }
-
-   glEnable GL_TEXTURE_2D;
-   glEnable GL_BLEND;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-
-   my $sw4 = ($sw + 3) & ~3;
-   my $lighting = "\x00" x ($sw4 * $sh);
-
-   for my $x (0 .. $sw - 1) {
-      for my $y (0 .. $sh - 1) {
-
-         my $cell = $map->[$x + $xofs][$y + $yofs]
-            or next;
-
-         my $darkness = $cell->[0] * (1 / 255);
-         if ($darkness < 0) {
-            $darkness = 0.15;
-         }
-         substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
-
-         for my $num (grep $_, @$cell[1,2,3]) {
-            my $tex = $::CONN->{face}[$num]{texture} || next;
-
-            glBindTexture GL_TEXTURE_2D, $tex->{name};
+      if ($::CONN->{mapw} > $sw) {
+         $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
+      } else {
+         $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
+      }
 
-            my $w = $tex->{width};
-            my $h = $tex->{height};
+      if ($::CONN->{maph} > $sh) {
+         $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
+      } else {
+         $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
+      }
 
-            my $px = ($x + 1) * 32 - $w;
-            my $py = ($y + 1) * 32 - $h;
+      glEnable GL_TEXTURE_2D;
+      glEnable GL_BLEND;
+      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+
+      my $sw4 = ($sw + 3) & ~3;
+      my $darkness = "\x00" x ($sw4 * $sh);
+
+      for my $x (0 .. $sw - 1) {
+         my $row = $map->[$x + $xofs];
+         for my $y (0 .. $sh - 1) {
+
+            my $cell = $row->[$y + $yofs]
+               or next;
+
+            my $dark = $cell->[0];
+            if ($dark < 0) {
+               substr $darkness, $y * $sw4 + $x, 1, chr 224;
+            } else {
+               substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
+            }
+
+            for my $num (grep $_, @$cell[1,2,3]) {
+               my $tex = $::CONN->{face}[$num]{texture} || next;
+               
+               my $w = $tex->{width};
+               my $h = $tex->{height};
 
-            glBegin GL_QUADS;
-            glTexCoord 0, 0; glVertex $px     , $py;
-            glTexCoord 0, 1; glVertex $px     , $py + $h;
-            glTexCoord 1, 1; glVertex $px + $w, $py + $h;
-            glTexCoord 1, 0; glVertex $px + $w, $py;
-            glEnd;
+               $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
+            }
          }
       }
-   }
 
 #   if (1) { # higher quality darkness
 #      $lighting =~ s/(.)/$1$1$1/gs;
@@ -824,27 +930,26 @@
 #      $lighting =~ s/(.)../$1/gs;
 #   }
 
-   $lighting = new Crossfire::Client::Texture
-      width          => $sw4,
-      height         => $sh,
-      data           => $lighting,
-      internalformat => GL_ALPHA4,
-      format         => GL_ALPHA;
+      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
 
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-   glColor 0, 0, 0, 0.75;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
-   glBindTexture GL_TEXTURE_2D, $lighting->{name};
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
-   glBegin GL_QUADS;
-   glTexCoord 0, 0; glVertex 0        , 0;
-   glTexCoord 0, 1; glVertex 0        , $sh * 32;
-   glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
-   glTexCoord 1, 0; glVertex $sw4 * 32, 0;
-   glEnd;
+      $darkness = new CFClient::Texture
+         width          => $sw4,
+         height         => $sh,
+         data           => $darkness,
+         internalformat => GL_ALPHA,
+         format         => GL_ALPHA;
 
-   glDisable GL_TEXTURE_2D;
-   glDisable GL_BLEND;
+      glColor 0.45, 0.45, 0.45, 1;
+      $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
+
+      glDisable GL_TEXTURE_2D;
+      glDisable GL_BLEND;
+
+      glEndList;
+   }
+
+   glCallList $self->{list};
 }
 
 my %DIR = (
@@ -900,17 +1005,17 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::Animator;
+package CFClient::Widget::Animator;
 
 use SDL::OpenGL;
 
-our @ISA = Crossfire::Client::Widget::Bin::;
+our @ISA = CFClient::Widget::Bin::;
 
 sub moveto {
    my ($self, $x, $y) = @_;
 
    $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
-   $self->{speed}  = 0.2;
+   $self->{speed}  = 0.001;
    $self->{time}   = 1;
    
    ::animation_start $self;
@@ -935,10 +1040,62 @@
    my ($self) = @_;
 
    glPushMatrix;
-   glRotate $self->{time} * 10000, 0, 1, 0;
+   glRotate $self->{time} * 1000, 0, 1, 0;
    $self->{children}[0]->draw;
    glPopMatrix;
 }
 
-1;
+#############################################################################
+
+package CFClient::Widget::Toplevel;
+
+our @ISA = CFClient::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 translate {
+   my ($self, $x, $y) = @_;
+
+   ($x, $y)
+}
+
+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 CFClient::Widget;
+
+$TOPLEVEL = new CFClient::Widget::Toplevel;
+
+1