--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/11 17:02:36	1.68
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/14 20:27:35	1.107
@@ -1,11 +1,9 @@
-package CFClient::Widget;
+package CFClient::UI;
 
 use strict;
 
-use Scalar::Util;
-
-use SDL::OpenGL;
-use SDL::OpenGL::Constants;
+use Scalar::Util ();
+use List::Util ();
 
 use CFClient;
 
@@ -47,7 +45,7 @@
 
    $BUTTON_STATE &= ~(1 << ($ev->button - 1));
 
-   $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
+   $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
 
    if (!$BUTTON_STATE) {
       my $grab = $GRAB; undef $GRAB;
@@ -65,22 +63,40 @@
    if ($widget != $HOVER) {
       my $hover = $HOVER; $HOVER = $widget;
 
-      $hover->update if $hover;
-      $HOVER->update if $HOVER;
+      $hover->update if $hover && $hover->{can_hover};
+      $HOVER->update if $HOVER && $HOVER->{can_hover};
    }
 
    $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
 }
 
+#############################################################################
+
+package CFClient::UI::Base;
+
+use strict;
+
+use SDL::OpenGL;
+
 sub new {
    my $class = shift;
 
-   bless {
+   my $self = bless {
       x => 0,
       y => 0,
       z => 0,
+      w => -1,
+      h => -1,
       @_
-   }, $class
+   }, $class;
+
+   for (keys %$self) {
+      if (/^connect_(.*)$/) {
+         $self->connect ($1 => delete $self->{$_});
+      }
+   }
+
+   $self
 }
 
 sub move {
@@ -99,14 +115,27 @@
    Carp::confess "size_request is abtract";
 }
 
-sub size_allocate {
-   my ($self, $w, $h) = @_;
+sub _size_allocate {
+   my ($self, $x, $y, $w, $h) = @_;
+
+   $self->{x} = $x;
+   $self->{y} = $y;
+
+   return unless $self->{w} != $w || $self->{h} != $h;
 
    $self->{w} = $w;
    $self->{h} = $h;
+
+   1
+}
+
+sub size_allocate {
+   my ($self, $x, $y, $w, $h) = @_;
+
+   $self->_size_allocate ($x, $y, $w, $h);
 }
 
-# translate global koordinates to local coordinate system
+# translate global coordinates to local coordinate system
 sub translate {
    my ($self, $x, $y) = @_;
 
@@ -117,6 +146,7 @@
    my ($self) = @_;
 
    return if $FOCUS == $self;
+   return unless $self->{can_focus};
 
    my $focus = $FOCUS; $FOCUS = $self;
    $focus->update if $focus;
@@ -157,18 +187,22 @@
    glPushMatrix;
    glTranslate $self->{x}, $self->{y}, 0;
    $self->_draw;
-   if ($self == $HOVER) {
-      glColor 1, 1, 1, 0.4;
+   glPopMatrix;
+
+   if ($self == $HOVER && $self->{can_hover}) {
+      my ($x, $y) = @$self{qw(x y)};
+
+      glColor 0, 0, 1, 0.2;
       glEnable GL_BLEND;
+      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
       glBegin GL_QUADS;
-      glVertex 0         , 0;
-      glVertex $self->{w}, 0;
-      glVertex $self->{w}, $self->{h};
-      glVertex 0         , $self->{h};
+      glVertex $x             , $y;
+      glVertex $x + $self->{w}, $y;
+      glVertex $x + $self->{w}, $y + $self->{h};
+      glVertex $x             , $y + $self->{h};
       glEnd;
       glDisable GL_BLEND;
    }
-   glPopMatrix;
 }
 
 sub _draw {
@@ -177,17 +211,6 @@
    warn "no draw defined for $self\n";
 }
 
-sub bbox {
-   my ($self) = @_;
-   my ($w, $h) = $self->size_request;
-   (
-     $self->{x},
-     $self->{y},
-     $self->{x} = $w,
-     $self->{y} = $h
-   )
-}
-
 sub find_widget {
    my ($self, $x, $y) = @_;
 
@@ -198,8 +221,6 @@
    ()
 }
 
-sub del_parent { $_[0]->{parent} = undef }
-
 sub set_parent {
    my ($self, $par) = @_;
 
@@ -218,6 +239,19 @@
       if $self->{parent};
 }
 
+sub connect {
+   my ($self, $signal, $cb) = @_;
+
+   push @{ $self->{cb}{$signal} }, $cb;
+}
+
+sub emit {
+   my ($self, $signal, @args) = @_;
+
+   $_->($self, @args)
+      for @{$self->{cb}{$signal} || []};
+}
+
 sub DESTROY {
    my ($self) = @_;
 
@@ -226,9 +260,9 @@
 
 #############################################################################
 
-package CFClient::Widget::DrawBG;
+package CFClient::UI::DrawBG;
 
-our @ISA = CFClient::Widget::;
+our @ISA = CFClient::UI::Base::;
 
 use strict;
 use SDL::OpenGL;
@@ -239,8 +273,8 @@
    # range [value, low, high, page]
 
    $class->SUPER::new (
-      bg        => [0, 0, 0, 0.4],
-      active_bg => [1, 1, 1],
+      bg        => [0, 0, 0, 0.2],
+      active_bg => [1, 1, 1, 0.5],
       @_
    )
 }
@@ -250,20 +284,25 @@
 
    my ($w, $h) = @$self{qw(w h)};
 
+   glEnable GL_BLEND;
+   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
    glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
+
    glBegin GL_QUADS;
    glVertex 0 , 0;
    glVertex 0 , $h;
    glVertex $w, $h;
    glVertex $w, 0;
    glEnd;
+
+   glDisable GL_BLEND;
 }
 
 #############################################################################
 
-package CFClient::Widget::Empty;
+package CFClient::UI::Empty;
 
-our @ISA = CFClient::Widget::;
+our @ISA = CFClient::UI::Base::;
 
 sub size_request {
    (0, 0)
@@ -273,9 +312,9 @@
 
 #############################################################################
 
-package CFClient::Widget::Container;
+package CFClient::UI::Container;
 
-our @ISA = CFClient::Widget::;
+our @ISA = CFClient::UI::Base::;
 
 sub new {
    my ($class, %arg) = @_;
@@ -289,9 +328,8 @@
 }
 
 sub add {
-   my ($self, $chld, $expand) = @_;
+   my ($self, $chld) = @_;
 
-   $chld->{expand} = $expand;
    $chld->set_parent ($self);
 
    $self->{children} = [
@@ -299,8 +337,8 @@
          @{$self->{children}}, $chld
    ];
 
-   $self->size_allocate ($self->{w}, $self->{h})
-      if $self->{w}; #TODO: check for "realised state"
+   $self->{w} = $self->{h} = -1;
+   $self->update;
 }
 
 sub remove {
@@ -308,7 +346,7 @@
 
    $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
 
-   $self->size_allocate ($self->{w}, $self->{h});
+   $self->size_allocate (0, 0, $self->{w}, $self->{h});
 }
 
 sub find_widget {
@@ -335,14 +373,14 @@
 
 #############################################################################
 
-package CFClient::Widget::Bin;
+package CFClient::UI::Bin;
 
-our @ISA = CFClient::Widget::Container::;
+our @ISA = CFClient::UI::Container::;
 
 sub new {
    my ($class, %arg) = @_;
 
-   my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
+   my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
 
    $class->SUPER::new (children => [$child], %arg)
 }
@@ -360,7 +398,7 @@
 
    $self->SUPER::remove ($widget);
 
-   $self->{children} = [new CFClient::Widget::Empty]
+   $self->{children} = [new CFClient::UI::Empty]
       unless @{$self->{children}};
 }
 
@@ -371,19 +409,18 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $x, $y, $w, $h) = @_;
 
-   return unless $self->{w} != $w || $self->{h} != $h;
+   $self->_size_allocate ($x, $y, $w, $h) or return;
 
-   $self->SUPER::size_allocate ($w, $h);
-   $self->{children}[0]->size_allocate ($w, $h);
+   $self->{children}[0]->size_allocate (0, 0, $w, $h);
 }
 
 #############################################################################
 
-package CFClient::Widget::Window;
+package CFClient::UI::Window;
 
-our @ISA = CFClient::Widget::Bin::;
+our @ISA = CFClient::UI::Bin::;
 
 use SDL::OpenGL;
 
@@ -404,21 +441,19 @@
 sub render_chld {
    my ($self) = @_;
 
-   $self->{texture} =
-      CFClient::Texture->new_from_opengl (
-         $self->{w}, $self->{h}, sub { $self->child->draw }
-      );
+   $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
+      glClearColor 0, 0, 0, 1;
+      glClear GL_COLOR_BUFFER_BIT;
+      $self->child->draw;
+   };
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
-
-   return unless $self->{w} != $w || $self->{h} != $h;
+   my ($self, $x, $y, $w, $h) = @_;
 
-   $self->{w} = $w;
-   $self->{h} = $h;
+   $self->_size_allocate ($x, $y, $w, $h) or return;
 
-   $self->child->size_allocate ($w, $h);
+   $self->child->size_allocate (0, 0, $w, $h);
 
    $self->render_chld;
 }
@@ -432,6 +467,7 @@
       or return;
 
    glEnable GL_BLEND;
+   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
@@ -443,9 +479,9 @@
 
 #############################################################################
 
-package CFClient::Widget::Frame;
+package CFClient::UI::Frame;
 
-our @ISA = CFClient::Widget::Bin::;
+our @ISA = CFClient::UI::Bin::;
 
 use SDL::OpenGL;
 
@@ -460,15 +496,11 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $x, $y, $w, $h) = @_;
    
-   return unless $self->{w} != $w || $self->{h} != $h;
-
-   $self->{w} = $w;
-   $self->{h} = $h;
+   $self->_size_allocate ($x, $y, $w, $h) or return;
 
-   $self->child->size_allocate ($w - 4, $h - 4);
-   $self->child->move (2, 2);
+   $self->child->size_allocate (2, 2, $w - 4, $h - 4);
 }
 
 sub _draw {
@@ -491,9 +523,9 @@
 
 #############################################################################
 
-package CFClient::Widget::FancyFrame;
+package CFClient::UI::FancyFrame;
 
-our @ISA = CFClient::Widget::Bin::;
+our @ISA = CFClient::UI::Bin::;
 
 use SDL::OpenGL;
 
@@ -501,175 +533,324 @@
       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 new {
+   my $class = shift;
+
+   # TODO: user_x, user_y, overwrite moveto?
+
+   $class->SUPER::new (
+      bg        => [1, 1, 1, 1],
+      border_bg => [1, 1, 1, 1],
+      border    => $::FONTSIZE * 0.8,
+      @_
+   )
+}
+
 sub size_request {
    my ($self) = @_;
 
-   my ($w, $h) = $self->SUPER::size_request;
+   return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
 
-   $h += $tex[1]->{height};
-   $h += $tex[4]->{height};
-   $w += $tex[2]->{width};
-   $w += $tex[3]->{width};
+   my ($w, $h) = $self->SUPER::size_request;
 
-   ($w, $h)
+   (
+      $w + $self->{border} * 2,
+      $h + $self->{border} * 2,
+   )
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $x, $y, $w, $h) = @_;
 
-   return unless $self->{w} != $w || $self->{h} != $h;
+   $self->_size_allocate ($x, $y, $w, $h) or return;
+
+   $h -= List::Util::max 0, $self->{border} * 2;
+   $w -= List::Util::max 0, $self->{border} * 2;
+
+   $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
+}
+
+sub button_down {
+   my ($self, $ev, $x, $y) = @_;
+
+   if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
+       && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
+
+      my ($ox, $oy) = ($ev->button_x, $ev->button_y);
+      my ($bw, $bh) = ($self->{w}, $self->{h});
+
+      $self->{motion} = sub {
+         my ($ev, $x, $y) = @_;
 
-   $self->SUPER::size_allocate ($w, $h);
+         ($x, $y) = ($ev->motion_x, $ev->motion_y);
 
-   $h -= $tex[1]->{height};
-   $h -= $tex[4]->{height};
-   $w -= $tex[2]->{width};
-   $w -= $tex[3]->{width};
+         $self->{user_w} = $bw + $x - $ox;
+         $self->{user_h} = $bh + $y - $oy;
+         $self->update;
+      };
 
-   $h = $h < 0 ? 0 : $h;
-   $w = $w < 0 ? 0 : $w;
+   } elsif ($x >= 0 && $x < $self->{w}
+            && $y >= 0 && $y < $self->{border}) {
 
-   my $child = $self->child;
+      my ($ox, $oy) = ($ev->button_x, $ev->button_y);
+      my ($bx, $by) = ($self->{x}, $self->{y});
 
-   $child->size_allocate ($w, $h);
-   $child->move ($tex[3]->{width}, $tex[1]->{height});
+      $self->{motion} = sub {
+         my ($ev, $x, $y) = @_;
+
+         ($x, $y) = ($ev->motion_x, $ev->motion_y);
+
+         $self->move ($bx + $x - $ox, $by + $y - $oy);
+         $self->update;
+      };
+   }
+}
+
+sub button_up {
+   my ($self, $ev, $x, $y) = @_;
+
+   delete $self->{motion};
+}
+
+sub mouse_motion {
+   my ($self, $ev, $x, $y) = @_;
+
+   $self->{motion}->($ev, $x, $y) if $self->{motion};
 }
 
 sub _draw {
    my ($self) = @_;
 
-   my ($w, $h) = ($self->{w}, $self->{h});
+   my ($w,  $h ) = ($self->{w}, $self->{h});
    my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
 
    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 $top = $tex[1];
-   $top->draw_quad (0, 0, $w, $top->{height});
-
-   my $left = $tex[3];
-   $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
-
-   my $right = $tex[2];
-   $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
+   glEnable GL_TEXTURE_2D;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
 
-   my $bottom = $tex[4];
-   $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
+   glColor @{ $self->{border_bg} };
+   $tex[1]->draw_quad (0, 0, $w, $self->{border});
+   $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
+   $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
+   $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
 
    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;
-
-   my $rep_x = $cw / $bg->{width};
-   my $rep_y = $ch / $bg->{height};
 
-   $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
+   # TODO: repeat texture not scale
+   my $rep_x = $cw / $bg->{w};
+   my $rep_y = $ch / $bg->{h};
+
+   glColor @{ $self->{bg} };
+
+   $bg->{s} = $rep_x;
+   $bg->{t} = $rep_y;
+   $bg->{wrap_mode} = 1;
+   $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
 
-   glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
+   glDisable GL_BLEND;
 
    $self->child->draw;
-
 }
 
 #############################################################################
 
-package CFClient::Widget::Table;
+package CFClient::UI::Table;
+
+our @ISA = CFClient::UI::Base::;
 
-our @ISA = CFClient::Widget::Bin::;
+use List::Util qw(max sum);
 
 use SDL::OpenGL;
 
+sub new {
+   my $class = shift;
+
+   $class->SUPER::new (
+      col_expand => [],
+      @_
+   )
+}
+
 sub add {
    my ($self, $x, $y, $chld) = @_;
-   my $old_chld = $self->{children}[$y][$x];
 
    $self->{children}[$y][$x] = $chld;
    $chld->set_parent ($self);
+
+   $self->{w} = $self->{h} = -1;
    $self->update;
 }
 
-sub max_row_height {
-   my ($self, $row) = @_;
+sub get_wh {
+   my ($self) = @_;
 
-   my $hs = 0;
-   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 }
-      }
-   }
-   return $hs;
-}
+   my (@w, @h);
+
+   for my $y (0 .. $#{$self->{children}}) {
+      my $row = $self->{children}[$y]
+         or next;
 
-sub max_col_width {
-   my ($self, $col) = @_;
+      for my $x (0 .. $#$row) {
+         my $widget = $row->[$x]
+            or next;
+         my ($w, $h) = $widget->size_request;
 
-   my $ws = 0;
-   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 }
+         $w[$x] = max $w[$x], $w;
+         $h[$y] = max $h[$y], $h;
       }
    }
-   return $ws;
+
+   (\@w, \@h)
 }
 
 sub size_request {
    my ($self) = @_;
 
-   my ($hs, $ws) = (0, 0);
+   my ($ws, $hs) = $self->get_wh;
 
-   for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
-      $hs += $self->max_row_height ($yi);
-   }
+   (
+      (sum @$ws),
+      (sum @$hs),
+   )
+}
+
+sub size_allocate {
+   my ($self, $x, $y, $w, $h) = @_;
+
+   $self->_size_allocate ($x, $y, $w, $h) or return;
+
+   my ($ws, $hs) = $self->get_wh;
+
+   my $req_w = sum @$ws;
+   my $req_h = sum @$hs;
 
-   for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
-      my $wm = 0;
-      for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
-         $wm += $self->max_col_width ($xi)
+   # TODO: nicer code && do row_expand
+   my @col_expand = @{$self->{col_expand}};
+   @col_expand = (1) x @$ws unless @col_expand;
+   my $col_expand = (sum @col_expand) || 1;
+
+   # linearly scale sizes
+   $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
+   $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
+
+   $_ = int $_ for @$ws; #TODO: avoid rounding problems
+   $_ = int $_ for @$hs; #TODO: avoid rounding problems
+
+   my $y;
+
+   for my $r (0 .. $#{$self->{children}}) {
+      my $row = $self->{children}[$r]
+         or next;
+
+      my $x = 0;
+      my $row_h = $hs->[$r];
+      
+      for my $c (0 .. $#$row) {
+         my $col_w = $ws->[$c];
+
+         if (my $widget = $row->[$c]) {
+            $widget->size_allocate ($x, $y, $col_w, $row_h);
+         }
+
+         $x += $col_w;
       }
-      if ($ws < $wm) { $ws = $wm }
+
+      $y += $row_h;
+   }
+
+}
+
+sub find_widget {
+   my ($self, $x, $y) = @_;
+
+   $x -= $self->{x};
+   $y -= $self->{y};
+
+   my $res;
+
+   for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
+      $res = $_->find_widget ($x, $y)
+         and return $res;
    }
 
-   return ($ws, $hs);
+   $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
 }
 
 sub _draw {
    my ($self) = @_;
 
-   my $y = 0;
-   for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
-      my $x = 0;
+   for (grep $_, @{$self->{children}}) {
+      $_->draw for grep $_, @$_;
+   }
+}
 
-      for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
+#############################################################################
 
-         my $c = $self->{children}->[$yi]->[$xi];
-         if ($c) {
-            $c->move ($x, $y, 0); #TODO: Move to size_request
-            $c->draw if $c;
-         }
+package CFClient::UI::HBox;
+
+# TODO: wrap into common Box base class
+
+our @ISA = CFClient::UI::Container::;
 
-         $x += $self->max_col_width ($xi);
+sub size_request {
+   my ($self) = @_;
+
+   my @alloc = map [$_->size_request], @{$self->{children}};
+
+   (
+      (List::Util::sum map $_->[0], @alloc),
+      (List::Util::max map $_->[1], @alloc),
+   )
+}
+
+sub size_allocate {
+   my ($self, $x, $y, $w, $h) = @_;
+
+   $self->_size_allocate ($x, $y, $w, $h);
+
+   ($h, $w) = ($w, $h);
+
+   my $children = $self->{children};
+
+   my @h = map +($_->size_request)[0], @$children;
+
+   my $req_h = List::Util::sum @h;
+
+   if ($req_h > $h) {
+      # ah well, not enough space
+      $_ *= $h / $req_h for @h;
+   } else {
+      my $exp = List::Util::sum map $_->{expand}, @$children;
+      $exp ||= 1;
+      
+      for (0 .. $#$children) {
+         my $child = $children->[$_];
+
+         my $alloc_h = $h[$_];
+         $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
+         $h[$_] = $alloc_h;
       }
+   }
+
+   my $y = 0;
+   for (0 .. $#$children) {
+      my $child = $children->[$_];
+      my $h = int $h[$_];
+      $child->size_allocate ($y, 0, $h, $w);
 
-      $y += $self->max_row_height ($yi);
+      $y += $h;
    }
 }
 
 #############################################################################
 
-package CFClient::Widget::VBox;
+package CFClient::UI::VBox;
 
-our @ISA = CFClient::Widget::Container::;
+# TODO: wrap into common Box base class
 
-use SDL::OpenGL;
+our @ISA = CFClient::UI::Container::;
 
 sub size_request {
    my ($self) = @_;
@@ -683,14 +864,9 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
-
-   return unless $self->{w} != $w || $self->{h} != $h;
+   my ($self, $x, $y, $w, $h) = @_;
 
-   $self->{w} = $w;
-   $self->{h} = $h;
-
-   return unless $self->{h};
+   $self->_size_allocate ($x, $y, $w, $h);
 
    my $children = $self->{children};
 
@@ -700,28 +876,23 @@
 
    if ($req_h > $h) {
       # ah well, not enough space
-      $_ = $h[$_] * $h / $req_h for @h;
+      $_ *= $h / $req_h for @h;
    } else {
-      my @exp = grep $_->{expand}, @$children;
-      @exp = @$children unless @exp;
+      my $exp = List::Util::sum map $_->{expand}, @$children;
+      $exp ||= 1;
       
-      my %exp = map +($_ => 1), @exp;
-
       for (0 .. $#$children) {
          my $child = $children->[$_];
 
-         my $alloc_h = $h[$_];
-         $alloc_h += ($h - $req_h) / @exp if $exp{$child};
-         $h[$_] = $alloc_h;
+         $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
       }
    }
 
    my $y = 0;
    for (0 .. $#$children) {
       my $child = $children->[$_];
-      my $h = $h[$_];
-      $child->move (0, $y);
-      $child->size_allocate ($w, $h);
+      my $h = int $h[$_];
+      $child->size_allocate (0, $y, $w, $h);
 
       $y += $h;
    }
@@ -729,9 +900,9 @@
 
 #############################################################################
 
-package CFClient::Widget::Label;
+package CFClient::UI::Label;
 
-our @ISA = CFClient::Widget::;
+our @ISA = CFClient::UI::Base::;
 
 use SDL::OpenGL;
 
@@ -739,10 +910,12 @@
    my ($class, %arg) = @_;
 
    my $self = $class->SUPER::new (
-      fg     => [1, 1, 1],
-      height => $::FONTSIZE,
-      text   => "",
-      layout => new CFClient::Layout,
+      fg       => [1, 1, 1],
+      fontsize => $::FONTSIZE,
+      text     => "",
+      align    => -1,
+      padding  => 2,
+      layout   => new CFClient::Layout,
       %arg
    );
 
@@ -768,6 +941,7 @@
    $self->{layout}->set_markup ($text);
 
    delete $self->{texture};
+#   $self->{w} = $self->{h} = -1;
    $self->update;
 }
 
@@ -781,26 +955,20 @@
    my ($self) = @_;
 
    $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)
-#   }
+   $self->{layout}->set_height ($self->{fontsize});
+   my ($w, $h) = $self->{layout}->size;
+
+   (
+      $w + $self->{padding} * 2,
+      $h + $self->{padding} * 2,
+   )
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $x, $y, $w, $h) = @_;
 
-   return unless $self->{w} != $w || $self->{h} != $h;
+   $self->_size_allocate ($x, $y, $w, $h) or return;
 
-   $self->SUPER::size_allocate ($w, $h);
    delete $self->{texture};
 }
 
@@ -816,27 +984,33 @@
 
    my $tex = $self->{texture} ||= do {
       $self->{layout}->set_width ($self->{w});
-      new_from_layout CFClient::Texture $self->{layout};
+      $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
+      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;
+   glEnable GL_TEXTURE_2D;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
    glColor @{$self->{fg}};
 
-   $tex->draw_quad (0, 0);
+   my $x =
+      $self->{align} < 0 ? $self->{padding}
+    : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
+    :                      ($self->{w} - $tex->{w}) * 0.5;
+
+   $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
 
-   glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
+   glDisable GL_BLEND;
 }
 
 #############################################################################
 
-package CFClient::Widget::Entry;
+package CFClient::UI::Entry;
 
-our @ISA = CFClient::Widget::Label::;
+our @ISA = CFClient::UI::Label::;
 
 use SDL;
 use SDL::OpenGL;
@@ -846,9 +1020,11 @@
 
    $class->SUPER::new (
       fg        => [1, 1, 1],
-      bg        => [0, 0, 0, 0.4],
-      active_bg => [1, 1, 1],
+      bg        => [0, 0, 0, 0.2],
+      active_bg => [1, 1, 1, 0.5],
       active_fg => [0, 0, 0],
+      can_hover => 1,
+      can_focus => 1,
       @_
    )
 }
@@ -856,16 +1032,25 @@
 sub _set_text {
    my ($self, $text) = @_;
 
+   my $old_text = $self->{text};
+
    $self->{last_activity} = $::NOW;
 
    $self->{text} = $text;
    $self->{layout}->set_width ($self->{w});
-   $self->{layout}->set_markup ($self->escape_text ($text));
+   $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
+
+   $text =~ s/./*/g if $self->{hidden};
+
+   $self->{layout}->set_markup ($self->escape_text ($text) . " ");
 
    $text = substr $text, 0, $self->{cursor};
    utf8::encode $text;
 
    @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
+
+   $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
+      if $old_text ne $self->{text};
 }
 
 sub size_request {
@@ -877,11 +1062,9 @@
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
-
-   return unless $self->{w} != $w || $self->{h} != $h;
+   my ($self, $x, $y, $w, $h) = @_;
 
-   $self->SUPER::size_allocate ($w, $h);
+   $self->SUPER::size_allocate ($x, $y, $w, $h);
 
    $self->_set_text ($self->{text});
 }
@@ -912,6 +1095,12 @@
       --$self->{cursor} if $self->{cursor};
    } elsif ($sym == SDLK_RIGHT) {
       ++$self->{cursor} if $self->{cursor} < length $self->{text};
+   } elsif ($sym == SDLK_HOME) {
+      $self->{cursor} = 0;
+   } elsif ($sym == SDLK_END) {
+      $self->{cursor} = length $text;
+   } elsif ($sym == SDLK_ESCAPE) {
+      $self->emit ('escape');
    } elsif ($uni) {
       substr $text, $self->{cursor}++, 0, chr $uni;
    }
@@ -936,7 +1125,7 @@
    my $idx = $self->{layout}->xy_to_index ($x, $y);
 
    # byte-index to char-index
-   my $text = $self->{layout};
+   my $text = $self->{text};
    utf8::encode $text;
    $self->{cursor} = length substr $text, 0, $idx;
 
@@ -961,12 +1150,15 @@
       glColor @{$self->{bg}};
    }
 
+   glEnable GL_BLEND;
+   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
    glBegin GL_QUADS;
    glVertex 0         , 0;
    glVertex 0         , $self->{h};
    glVertex $self->{w}, $self->{h};
    glVertex $self->{w}, 0;
    glEnd;
+   glDisable GL_BLEND;
 
    $self->SUPER::_draw;
 
@@ -980,38 +1172,240 @@
    }
 }
 
+package CFClient::UI::LineEntry;
+
+our @ISA = CFClient::UI::Entry::;
+
+use SDL;
+use SDL::OpenGL;
+
+sub key_down {
+   my ($self, $ev) = @_;
+
+   my $sym = $ev->key_sym;
+
+   if ($sym == SDLK_RETURN) {
+      $self->emit (activate => $self->get_text);
+      $self->update;
+
+   } else {
+      $self->SUPER::key_down ($ev);
+   }
+
+}
+
 #############################################################################
 
-package CFClient::Widget::Slider;
+package CFClient::UI::Button;
 
-use strict;
+our @ISA = CFClient::UI::Label::;
 
+use SDL;
 use SDL::OpenGL;
-use SDL::OpenGL::Constants;
 
-our @ISA = CFClient::Widget::DrawBG::;
+my @tex =
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+         qw(b1_button_active.png);
+
+sub new {
+   my $class = shift;
+
+   $class->SUPER::new (
+      padding   => 4,
+      fg        => [1, 1, 1],
+      bg        => [1, 1, 1, 0.2],
+      active_fg => [1, 1, 0],
+      can_hover => 1,
+      @_
+   )
+}
+
+sub button_up {
+   my ($self, $ev, $x, $y) = @_;
+
+   if ($x >= 0 && $x < $self->{w}
+       && $y >= 0 && $y < $self->{h}) {
+      $self->emit ("activate");
+   }
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   local $self->{fg} = $self->{fg};
+   my $tex = $tex[0];
+
+   glEnable GL_BLEND;
+   glEnable GL_TEXTURE_2D;
+   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+
+   if ($GRAB == $self) {
+      $self->{fg} = $self->{active_fg};
+   }
+
+   glBindTexture GL_TEXTURE_2D, $tex->{name};
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+
+   $tex->draw_quad (0, 0, $self->{w}, $self->{h});
+
+   glDisable GL_TEXTURE_2D;
+   glDisable GL_BLEND;
+
+   $self->SUPER::_draw;
+}
+
+#############################################################################
+
+package CFClient::UI::CheckBox;
+
+our @ISA = CFClient::UI::DrawBG::;
+
+my @tex =
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+         qw(c1_checkbox_bg.png c1_checkbox_active.png);
+
+use SDL;
+use SDL::OpenGL;
+
+sub new {
+   my $class = shift;
+
+   $class->SUPER::new (
+      padding   => 2,
+      fg        => [1, 1, 1],
+      active_fg => [1, 1, 0],
+      state     => 0,
+      can_hover => 1,
+      @_
+   )
+}
 
 sub size_request {
    my ($self) = @_;
 
-   my $w =
-   my $h = 10;
+   ($self->{padding} * 2 + 6) x 2
+}
 
-   $self->{vertical} ? ($h, $w) : ($w, $h)
+sub size_allocate {
+   my ($self, $x, $y, $w, $h) = @_;
+
+   $self->_size_allocate ($x, $y, $w, $h);
 }
 
+sub button_down {
+   my ($self, $ev, $x, $y) = @_;
+
+   if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
+       && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
+      $self->{state} = !$self->{state};
+      $self->emit (changed => $self->{state});
+   }
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   $self->SUPER::_draw;
+
+   glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
+
+   my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
+
+   glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
+
+   glEnable GL_BLEND;
+   glEnable GL_TEXTURE_2D;
+   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+
+   my $tex = $self->{state} ? $tex[1] : $tex[0];
+
+   $tex->draw_quad (0, 0, $s, $s);
+
+   glDisable GL_TEXTURE_2D;
+   glDisable GL_BLEND;
+}
+
+#############################################################################
+
+package CFClient::UI::Slider;
+
+use strict;
+
+use SDL::OpenGL;
+
+our @ISA = CFClient::UI::DrawBG::;
+
+my @tex =
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+         qw(s1_slider.png s1_slider_bg.png);
+
 sub new {
    my $class = shift;
 
    # range [value, low, high, page]
 
-   $class->SUPER::new (
+   # TODO: 0-width page
+   # TODO: req_w/h are wrong with vertical
+   # TODO: calculations are off
+   my $self = $class->SUPER::new (
       fg        => [1, 1, 1],
       active_fg => [0, 0, 0],
       range     => [0, 0, 100, 10],
+      req_w     => 40,
+      req_h     => 13,
       vertical  => 0,
+      can_hover => 1,
+      inner_pad => 5,
       @_
-   )
+   );
+
+   $self
+}
+
+sub size_request {
+   my ($self) = @_;
+
+   my $w = $self->{req_w};
+   my $h = $self->{req_h};
+
+   $self->{vertical} ? ($h, $w) : ($w, $h)
+}
+
+sub button_down {
+   my ($self, $ev, $x, $y) = @_;
+
+   $self->SUPER::button_down ($ev, $x, $y);
+   $self->mouse_motion ($ev, $x, $y);
+}
+
+sub mouse_motion {
+   my ($self, $ev, $x, $y) = @_;
+
+   if ($GRAB == $self) {
+      my ($value, $lo, $hi, $page) = @{$self->{range}};
+
+      my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
+
+      my $inner_pad_px = $self->_calc_inner_pad_px ($w);
+      my $inner_w = $w - $inner_pad_px * 2;               # * 2 for left & right
+
+      $x -= $inner_pad_px;  # substract the padding
+      $x = $x * ($hi - $lo) / $inner_w + $lo;
+      $x = $lo         if $x < $lo;
+      $x = $hi - $page if $x > $hi - $page;
+      $self->{range}[0] = $x;
+
+      $self->emit (changed => $x);
+      $self->update;
+   }
+}
+
+# the inner_* stuff is for generating a padding for the slider handle,
+# so that the handle doesn't leave the texture. This calculation isn't 100%
+# correct propably, but it does the job for now
+sub _calc_inner_pad_px {
+   my ($self, $w) = @_;
+   ($w / 100) * $self->{inner_pad} # % to pixels
 }
 
 sub _draw {
@@ -1024,8 +1418,8 @@
    if ($self->{vertical}) {
       # draw a vertical slider like a rotated horizontal slider
  
-      glTranslate 0, $self->{w};
       glRotate 90, 0, 0, 1;
+      glTranslate 0, -$self->{w}, 0;
 
       ($w, $h) = ($h, $w);
    }
@@ -1033,17 +1427,208 @@
    my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
    my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
 
-   glColor @$fg;
-   glBegin GL_LINES;
-   glVertex 0, 0; glVertex 0, $h;
-   glVertex $w - 1, 0; glVertex $w - 1, $h;
-   glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
-   glEnd;
+   my ($value, $lo, $hi, $page) = @{$self->{range}};
+
+   $hi = $value + 1 if $lo == $hi;
+
+   my $inner_pad_px = $self->_calc_inner_pad_px ($w);
+   my $inner_w = $w - $inner_pad_px * 2;               # * 2 for left & right
+
+   $page  = int $page * $inner_w / ($hi - $lo);
+   $value = int +($value - $lo) * $inner_w / ($hi - $lo);
+
+   $w -= $page;
+   $page &= ~1;
+   glTranslate $page * 0.5, 0, 0;
+   $page ||= 2;
+
+   my $knob_a = $inner_pad_px + ($value - $page * 0.5);
+   my $knob_b = $inner_pad_px + ($value + $page * 0.5);
+
+   glEnable GL_BLEND;
+   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+   glEnable GL_TEXTURE_2D;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+
+   # draw background
+   $tex[1]->draw_quad (0, 0, $w, $h);
+
+   # draw handle
+   $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
+
+   glDisable GL_BLEND;
+   glDisable GL_TEXTURE_2D;
 }
 
 #############################################################################
 
-package CFClient::Widget::MapWidget;
+package CFClient::UI::TextView;
+
+our @ISA = CFClient::UI::HBox::;
+
+use SDL::OpenGL;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      req_w    => $::WIDTH / 6,
+      req_h    => $::HEIGHT / 6,
+      fontsize => $::FONTSIZE,
+      @_,
+
+      layout   => (new CFClient::Layout),
+      par      => [],
+      height   => 0,
+      children => [
+         (new CFClient::UI::Empty expand => 1),
+         (new CFClient::UI::Slider vertical => 1),
+      ],
+   );
+
+   $self->{children}[1]->connect (changed => sub {
+      $self->update;
+   });
+
+   $self
+}
+
+sub set_fontsize {
+   my ($self, $fontsize) = @_;
+
+   $self->{fontsize} = $fontsize;
+   $self->reflow;
+}
+
+sub text_height {
+   my ($self, $text) = @_;
+
+   my $layout = $self->{layout};
+
+   $layout->set_height ($self->{fontsize});
+   $layout->set_width ($self->{w});
+   $layout->set_text ($text);
+   
+   ($layout->size)[1]
+}
+
+sub reflow {
+   my ($self) = @_;
+
+   $self->{need_reflow}++;
+   $self->update;
+}
+
+sub size_request {
+   my ($self) = @_;
+
+   ($self->{req_w}, $self->{req_h})
+}
+
+sub size_allocate {
+   my ($self, $x, $y, $w, $h) = @_;
+
+   $self->SUPER::size_allocate ($x, $y, $w, $h);
+
+   $self->{layout}->set_height ($self->{fontsize});
+   $self->{layout}->set_width ($self->{w});
+
+   $self->reflow;
+}
+
+sub add_paragraph {
+   my ($self, $color, $text) = @_;
+
+   #TODO: intelligently "reformat" paragraph
+
+   my $height = $self->text_height ($text);
+
+   $self->{height} += $height;
+
+   push @{$self->{par}}, [$height, $color, $text];
+
+   $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
+   $self->{children}[1]->update;
+}
+
+sub update {
+   my ($self) = @_;
+
+   $self->SUPER::update;
+
+   return unless $self->{h} > 0;
+
+   delete $self->{texture};
+
+   $TOPLEVEL->on_refresh ($self, sub {
+      if (delete $self->{need_reflow}) {
+         my $height = 0;
+
+         $height += $_->[0] = $self->text_height ($_->[2])
+            for @{$self->{par}};
+
+         $self->{height} = $height;
+
+         $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
+         
+         delete $self->{texture};
+      }
+
+      $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
+         glClearColor 0, 0, 0, 1;
+         glClear GL_COLOR_BUFFER_BIT;
+
+         glEnable GL_BLEND;
+         glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+         glEnable GL_TEXTURE_2D;
+         glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+
+         my $top = int $self->{children}[1]{range}[0];
+
+         my $y0 = $top;
+         my $y1 = $top + $self->{h};
+
+         my $y = 0;
+
+         my $layout = $self->{layout};
+
+         for my $par (@{$self->{par}}) {
+            my $h = $par->[0];
+
+            if ($y0 < $y + $h && $y < $y1) {
+               $layout->set_text ($par->[2]);
+
+               glColor @{ $par->[1] };
+               my ($W, $H) = $layout->size;
+               CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
+            }
+
+            $y += $h;
+         }
+
+         glDisable GL_TEXTURE_2D;
+         glDisable GL_BLEND;
+      };
+   });
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   if ($self->{texture}) {
+      glEnable GL_TEXTURE_2D;
+      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+      $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
+      glDisable GL_TEXTURE_2D;
+   }
+
+   $self->{children}[1]->draw;
+
+}
+
+#############################################################################
+
+package CFClient::UI::MapWidget;
 
 use strict;
 
@@ -1051,16 +1636,16 @@
 
 use SDL;
 use SDL::OpenGL;
-use SDL::OpenGL::Constants;
 
-our @ISA = CFClient::Widget::;
+our @ISA = CFClient::UI::Base::;
 
 sub new {
    my $class = shift;
 
    $class->SUPER::new (
-      z    => -1,
-      list => (glGenLists 1),
+      z         => -1,
+      can_focus => 1,
+      list      => (glGenLists 1),
       @_
    )
 }
@@ -1074,8 +1659,8 @@
 
 sub size_request {
    (
-      1 + int $::WIDTH  / 32,
-      1 + int $::HEIGHT / 32,
+      1 + 32 * int $::WIDTH  / 32,
+      1 + 32 * int $::HEIGHT / 32,
    )
 }
 
@@ -1083,98 +1668,76 @@
    my ($self) = @_;
 
    $self->{need_update} = 1;
+   $self->SUPER::update;
 }
 
-sub _draw {
+sub draw {
    my ($self) = @_;
 
+   $self->{need_update}++;#d#
    if (delete $self->{need_update}) {
       glNewList $self->{list}, GL_COMPILE;
 
-      my $mx = $::CONN->{mapx};
-      my $my = $::CONN->{mapy};
-
-      my $map = $::CONN->{map};
+      my $sw = int $::WIDTH  / 32;
+      my $sh = int $::HEIGHT / 32;
 
-      my ($xofs, $yofs);
+      if ($::MAP) {
+         my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
 
-      my $sw = 1 + int $::WIDTH  / 32;
-      my $sh = 1 + int $::HEIGHT / 32;
-
-      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};
-      }
-
-      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 $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;
+         if ($::CFG->{fow_enable}) {
+            if ($::CFG->{fow_smooth}) { # smooth fog of war
+               glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
+               glConvolutionFilter2D
+                  GL_CONVOLUTION_2D,
+                  GL_ALPHA,
+                  3, 3,
+                  GL_ALPHA, GL_FLOAT,
+                  pack "f*",
+                     0.1, 0.1, 0.1,
+                     0.1, 0.2, 0.1,
+                     0.1, 0.1, 0.1,
+               ;
+               glEnable GL_CONVOLUTION_2D;
             }
 
-            for my $num (grep $_, @$cell[1,2,3]) {
-               my $tex = $::CONN->{face}[$num]{texture} || next;
-               
-               my $w = $tex->{width};
-               my $h = $tex->{height};
+            my $tex = new CFClient::Texture
+               w              => $w,
+               h              => $h,
+               data           => $data,
+               internalformat => GL_ALPHA,
+               format         => GL_ALPHA;
+
+            glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
+
+            glEnable GL_BLEND;
+            glEnable GL_TEXTURE_2D;
+            glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
 
-               $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
-            }
+            glColor +($::CFG->{fow_intensity}) x 3, 1;
+            $tex->draw_quad (0, 0, $w * 32, $h * 32);
+
+            glDisable GL_TEXTURE_2D;
+            glDisable GL_BLEND;
          }
       }
 
-#   if (1) { # higher quality darkness
-#      $lighting =~ s/(.)/$1$1$1/gs;
-#      my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
-#
-#      $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
-#
-#      $lighting = $pb->get_pixels;
-#      $lighting =~ s/(.)../$1/gs;
-#   }
-
-      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
-
-      $darkness = new CFClient::Texture
-         width          => $sw4,
-         height         => $sh,
-         data           => $darkness,
-         internalformat => GL_ALPHA,
-         format         => GL_ALPHA;
-
-      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};
+
+   if ($FOCUS != $self) {
+      glColor 64/255, 64/255, 64/255;
+      glLogicOp GL_AND;
+      glEnable GL_COLOR_LOGIC_OP;
+      glBegin GL_QUADS;
+      glVertex 0, 0;
+      glVertex 0, $::HEIGHT;
+      glVertex $::WIDTH, $::HEIGHT;
+      glVertex $::WIDTH, 0;
+      glEnd;
+      glDisable GL_COLOR_LOGIC_OP;
+   }
 }
 
 my %DIR = (
@@ -1200,16 +1763,22 @@
    my $sym = $ev->key_sym;
 
    if ($sym == SDLK_KP5) {
-      $::CONN->send ("command stay fire");
+      $::CONN->user_send ("command stay fire");
+   } elsif ($sym == SDLK_a) {
+      $::CONN->user_send ("command apply");
+   } elsif ($sym == SDLK_QUOTE) {
+      $self->emit ('activate_console');
+   } elsif ($sym == SDLK_SLASH) {
+      $self->emit ('activate_console' => '/');
    } elsif (exists $DIR{$sym}) {
       if ($mod & KMOD_SHIFT) {
          $self->{shft}++;
-         $::CONN->send ("command fire $DIR{$sym}[0]");
+         $::CONN->user_send ("command fire $DIR{$sym}[0]");
       } elsif ($mod & KMOD_CTRL) {
          $self->{ctrl}++;
-         $::CONN->send ("command run $DIR{$sym}[0]");
+         $::CONN->user_send ("command run $DIR{$sym}[0]");
       } else {
-         $::CONN->send ("command $DIR{$sym}[1]");
+         $::CONN->user_send ("command $DIR{$sym}[1]");
       }
    }
 }
@@ -1221,20 +1790,20 @@
    my $sym = $ev->key_sym;
 
    if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
-      $::CONN->send ("command fire_stop");
+      $::CONN->user_send ("command fire_stop");
    }
    if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
-      $::CONN->send ("command run_stop");
+      $::CONN->user_send ("command run_stop");
    }
 }
 
 #############################################################################
 
-package CFClient::Widget::Animator;
+package CFClient::UI::Animator;
 
 use SDL::OpenGL;
 
-our @ISA = CFClient::Widget::Bin::;
+our @ISA = CFClient::UI::Bin::;
 
 sub moveto {
    my ($self, $x, $y) = @_;
@@ -1272,20 +1841,60 @@
 
 #############################################################################
 
-package CFClient::Widget::Toplevel;
+package CFClient::UI::Flopper;
+
+our @ISA = CFClient::UI::Button::;
 
-our @ISA = CFClient::Widget::Container::;
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      state => 0,
+      connect_activate => \&toggle_flopper,
+      @_
+   );
+
+   if ($self->{state}) {
+      $self->{state} = 0;
+      $self->toggle_flopper;
+   }
+
+   $self
+}
+
+sub toggle_flopper {
+   my ($self) = @_;
+
+   # TODO: use animation
+   if ($self->{state} = !$self->{state}) {
+      $CFClient::UI::TOPLEVEL->add ($self->{other});
+      $self->{other}->move (
+         ($::WIDTH  - $self->{other}{w}) * 0.5,
+         ($::HEIGHT - $self->{other}{h}) * 0.5,
+      );
+   } else {
+      $CFClient::UI::TOPLEVEL->remove ($self->{other});
+   }
+}
+
+#############################################################################
+
+package CFClient::UI::Toplevel;
+
+our @ISA = CFClient::UI::Container::;
+
+use SDL::OpenGL;
 
 sub size_request {
    ($::WIDTH, $::HEIGHT)
 }
 
 sub size_allocate {
-   my ($self, $w, $h) = @_;
+   my ($self, $x, $y, $w, $h) = @_;
 
-   $self->SUPER::size_allocate ($w, $h);
+   $self->_size_allocate ($x, $y, $w, $h);
 
-   $_->size_allocate ($_->size_request)
+   $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
       for @{$self->{children}};
 }
 
@@ -1298,7 +1907,7 @@
 sub update {
    my ($self) = @_;
 
-   $self->size_allocate ($self->size_request);
+   $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
    ::refresh ();
 }
 
@@ -1307,20 +1916,40 @@
 
    $self->SUPER::add ($widget);
 
-   $widget->size_allocate ($widget->size_request);
+   $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
+}
+
+sub on_refresh {
+   my ($self, $id, $cb) = @_;
+
+   $self->{refresh_hook}{$id} = $cb;
 }
 
 sub draw  {
    my ($self) = @_;
 
+   while (my $rcb = delete $self->{refresh_hook}) {
+      $_->() for values %$rcb;
+   }
+
+   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;
 }
 
 #############################################################################
 
-package CFClient::Widget;
+package CFClient::UI;
 
-$TOPLEVEL = new CFClient::Widget::Toplevel;
+$TOPLEVEL = new CFClient::UI::Toplevel;
 
 1