--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/19 06:06:45	1.134
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/24 08:22:22	1.165
@@ -10,53 +10,92 @@
 our ($FOCUS, $HOVER, $GRAB); # various widgets
 
 our $ROOT;
+our $TOOLTIP;
 our $BUTTON_STATE;
 
+sub check_tooltip {
+   if (!$GRAB) {
+      for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
+         if (length $widget->{tooltip}) {
+
+            if ($TOOLTIP->{owner} != $widget) {
+               $TOOLTIP->{owner} = $widget;
+
+               my $tip = $widget->{tooltip};
+
+               $tip = $tip->($widget) if CODE:: eq ref $tip;
+               
+               $TOOLTIP->set_markup ($widget->{tooltip});
+               $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
+               $TOOLTIP->show;
+            }
+
+            return;
+         }
+      }
+   }
+
+   $TOOLTIP->hide;
+   delete $TOOLTIP->{owner};
+}
+
 # class methods for events
 sub feed_sdl_key_down_event { 
-   $FOCUS->key_down ($_[0]) if $FOCUS;
+   $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
+      if $FOCUS;
 }
 
 sub feed_sdl_key_up_event {
-   $FOCUS->key_up ($_[0]) if $FOCUS;
+   $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
+      if $FOCUS;
 }
 
 sub feed_sdl_button_down_event {
    my ($ev) = @_;
-   my ($x, $y) = ($ev->motion_x, $ev->motion_y);
+   my ($x, $y) = ($ev->{x}, $ev->{y});
 
    if (!$BUTTON_STATE) {
       my $widget = $ROOT->find_widget ($x, $y);
 
       $GRAB = $widget;
       $GRAB->update if $GRAB;
+
+      check_tooltip;
    }
 
-   $BUTTON_STATE |= 1 << ($ev->button - 1);
+   $BUTTON_STATE |= 1 << ($ev->{button} - 1);
 
-   $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
+   if ($GRAB) {
+      ($x, $y) = $GRAB->coord2local ($x, $y);
+      $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
+   }
 }
 
 sub feed_sdl_button_up_event {
    my ($ev) = @_;
-   my ($x, $y) = ($ev->motion_x, $ev->motion_y);
+   my ($x, $y) = ($ev->{x}, $ev->{y});
 
    my $widget = $GRAB || $ROOT->find_widget ($x, $y);
 
-   $BUTTON_STATE &= ~(1 << ($ev->button - 1));
+   $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
 
-   $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
+   if ($GRAB) {
+      ($x, $y) = $GRAB->coord2local ($x, $y);
+      $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
+   }
 
    if (!$BUTTON_STATE) {
       my $grab = $GRAB; undef $GRAB;
       $grab->update if $grab;
       $GRAB->update if $GRAB;
+
+      check_tooltip;
    }
 }
 
 sub feed_sdl_motion_event {
    my ($ev) = @_;
-   my ($x, $y) = ($ev->motion_x, $ev->motion_y);
+   my ($x, $y) = ($ev->{x}, $ev->{y});
 
    my $widget = $GRAB || $ROOT->find_widget ($x, $y);
 
@@ -65,9 +104,14 @@
 
       $hover->update if $hover && $hover->{can_hover};
       $HOVER->update if $HOVER && $HOVER->{can_hover};
+
+      check_tooltip;
    }
 
-   $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
+   if ($HOVER) {
+      ($x, $y) = $HOVER->coord2local ($x, $y);
+      $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
+   }
 }
 
 # convert position array to integers
@@ -89,15 +133,16 @@
 
 use strict;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my $class = shift;
 
    my $self = bless {
-      x => 0,
-      y => 0,
-      z => 0,
+      x          => 0,
+      y          => 0,
+      z          => 0,
+      can_events => 1,
       @_
    }, $class;
 
@@ -110,6 +155,13 @@
    $self
 }
 
+sub destroy {
+   my ($self) = @_;
+
+   $self->hide;
+   %$self = ();
+}
+
 sub show {
    my ($self) = @_;
 
@@ -121,9 +173,11 @@
 sub hide {
    my ($self) = @_;
 
-   return unless $self->{parent};
+   undef $GRAB  if $GRAB  == $self;
+   undef $HOVER if $HOVER == $self;
 
-   $self->{parent}->remove ($self);
+   $self->{parent}->remove ($self)
+      if $self->{parent};
 }
 
 sub move {
@@ -136,34 +190,61 @@
    $self->update;
 }
 
-sub needs_redraw {
-   0
+sub set_size {
+   my ($self, $w, $h) = @_;
+
+   $self->{user_w} = $w;
+   $self->{user_h} = $h;
+
+   $self->check_size;
 }
 
 sub size_request {
    require Carp;
-   Carp::confess "size_request is abtract";
+   Carp::confess "size_request is abstract";
 }
 
 sub configure {
    my ($self, $x, $y, $w, $h) = @_;
 
-   $self->{x} = $x;
-   $self->{y} = $y;
+   if ($self->{aspect}) {
+      my $w2 = List::Util::min $w, int $h * $self->{aspect};
+      my $h2 = List::Util::min $h, int $w / $self->{aspect};
 
-   return unless $self->{w} != $w || $self->{h} != $h;
+      # use alignment to adjust x, y
 
-   $self->{w} = $w;
-   $self->{h} = $h;
+      $x += int +($w - $w2) * 0.5;
+      $y += int +($h - $h2) * 0.5;
 
-   $self->size_allocate ($w, $h);
-   $self->update;
+      ($w, $h) = ($w2, $h2);
+   }
+
+   if ($self->{x} != $x || $self->{y} != $y) {
+      $self->{x} = $x;
+      $self->{y} = $y;
+      $self->update;
+   }
+
+   if ($self->{w} != $w || $self->{h} != $h) {
+      $self->{w} = $w;
+      $self->{h} = $h;
+
+      $self->size_allocate ($w, $h);
+      $self->update;
+   }
 }
 
 sub size_allocate {
    # nothing to be done
 }
 
+sub set_max_size {
+   my ($self, $w, $h) = @_;
+
+   delete $self->{max_w}; $self->{max_w} = $w if $w;
+   delete $self->{max_h}; $self->{max_h} = $h if $h;
+}
+
 # return top left coordinates
 sub _topleft {
    my ($self, $x, $y) = @_;
@@ -254,6 +335,20 @@
       glEnd;
       glDisable GL_BLEND;
    }
+
+   if ($ENV{PCLIENT_DEBUG}) {
+      glPushMatrix;
+      glColor 1, 1, 0, 1;
+      glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
+      glBegin GL_LINE_LOOP;
+      glVertex 0         , 0;
+      glVertex $self->{w}, 0;
+      glVertex $self->{w}, $self->{h};
+      glVertex 0         , $self->{h};
+      glEnd;
+      glPopMatrix;
+      CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
+   }
 }
 
 sub _draw {
@@ -265,6 +360,8 @@
 sub find_widget {
    my ($self, $x, $y) = @_;
 
+   return () unless $self->{can_events};
+
    return $self
       if $x >= $self->{x} && $x < $self->{x} + $self->{w}
           && $y >= $self->{y} && $y < $self->{y} + $self->{h};
@@ -281,14 +378,26 @@
 sub check_size {
    my ($self) = @_;
 
-   my ($w, $h) = $self->size_request;
+   $self->{parent}
+      or return 1;
+
+   my ($w, $h) = $self->{user_w} && $self->{user_h}
+      ? @$self{qw(user_w user_h)}
+      : $self->size_request;
 
-   if ($w != $self->{req_w}  || $h != $self->{req_h}) {
+   if ($w != $self->{req_w} || $h != $self->{req_h}) {
       $self->{req_w} = $w;
       $self->{req_h} = $h;
 
       $self->{parent}->check_size
-         if $self->{parent};
+         or $self->size_allocate (
+               (List::Util::max $self->{w}, $w),
+               (List::Util::max $self->{h}, $h),
+            );
+
+      1
+   } else {
+      0
    }
 }
 
@@ -308,9 +417,7 @@
 sub emit {
    my ($self, $signal, @args) = @_;
 
-   for my $cb (@{$self->{signal_cb}{$signal} || []}) {
-      $cb->($self, @args);
-   }
+   List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
 }
 
 sub DESTROY {
@@ -326,7 +433,7 @@
 our @ISA = CFClient::UI::Base::;
 
 use strict;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my $class = shift;
@@ -365,6 +472,11 @@
 
 our @ISA = CFClient::UI::Base::;
 
+sub new {
+   my ($class, %arg) = @_;
+   $class->SUPER::new (can_events => 0, %arg);
+}
+
 sub size_request {
    (0, 0)
 }
@@ -382,7 +494,7 @@
 
    my $children = delete $arg{children} || [];
 
-   my $self = $class->SUPER::new (children => [], %arg);
+   my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
    $self->add ($_) for @$children;
 
    $self
@@ -407,10 +519,24 @@
    my ($self, $child) = @_;
 
    delete $child->{parent};
+   $child->hide;
 
    $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
 
    $self->check_size;
+   $self->update;
+}
+
+sub clear {
+   my ($self) = @_;
+
+   my $children = delete $self->{children};
+   $self->{children} = [];
+
+   for (@$children) {
+      delete $_->{parent};
+      $_->hide;
+   }
 }
 
 sub find_widget {
@@ -484,7 +610,7 @@
 
 our @ISA = CFClient::UI::Bin::;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my ($class, %arg) = @_;
@@ -548,7 +674,7 @@
 sub size_request {
    my ($self) = @_;
 
-   @$self{qw(child_w child_h)} = $self->child->size_request;
+   @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
    $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
 
    @$self{qw(child_w child_h)}
@@ -567,40 +693,43 @@
 
 our @ISA = CFClient::UI::Bin::;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
-sub size_request {
-   my ($self) = @_;
-   my $chld = $self->child
-      or return (0, 0);
-
-   $chld->move (2, 2);
+sub new {
+   my $class = shift;
 
-   map { $_ + 4 } $chld->size_request;
-}
+   my $self = $class->SUPER::new (
+      bg        => [1, 1, 1, 1],
+      border_bg => [1, 1, 1, 1],
+      border    => 0.8,
+      @_
+   );
 
-sub size_allocate {
-   my ($self, $x, $y, $w, $h) = @_;
-   
-   $self->child->configure (2, 2, $w - 4, $h - 4);
+   $self
 }
 
 sub _draw {
    my ($self) = @_;
 
-   my $chld = $self->child;
+   my ($w, $h) = ($self->{w}, $self->{h});
 
-   my ($w, $h) = $chld->size_request;
+   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;
 
-   glBegin GL_QUADS;
-   glColor 0, 0, 0;
-   glVertex 0      , 0;
-   glVertex 0      , $h + 4;
-   glVertex $w + 4 , $h + 4;
-   glVertex $w + 4 , 0;
-   glEnd;
+#   glBegin GL_QUADS;
+#   glColor 0, 0, 0, 0;
+#   glVertex 0 , 0;
+#   glVertex 0 , $h;
+#   glVertex $w, $h;
+#   glVertex $w, 0;
+#   glEnd;
 
-   $chld->draw;
+
+   $self->child->draw;
+   glDisable GL_BLEND;
+   glDisable GL_TEXTURE_2D;
 }
 
 #############################################################################
@@ -609,10 +738,10 @@
 
 our @ISA = CFClient::UI::Bin::;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 my @tex = 
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
 
 sub new {
@@ -620,12 +749,20 @@
 
    # TODO: user_x, user_y, overwrite moveto?
 
-   $class->SUPER::new (
-      bg        => [1, 1, 1, 1],
-      border_bg => [1, 1, 1, 1],
-      border    => 0.8,
+   my $self = $class->SUPER::new (
+      bg         => [1, 1, 1, 1],
+      border_bg  => [1, 1, 1, 1],
+      border     => 0.8,
       @_
-   )
+   );
+
+   $self->{title} &&= new CFClient::UI::Label
+      align    => 0,
+      valign   => 1,
+      text     => $self->{title},
+      fontsize => 1;
+
+   $self
 }
 
 sub border {
@@ -635,8 +772,6 @@
 sub size_request {
    my ($self) = @_;
 
-   return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
-
    my ($w, $h) = $self->SUPER::size_request;
 
    (
@@ -651,6 +786,9 @@
    $h -= List::Util::max 0, $self->border * 2;
    $w -= List::Util::max 0, $self->border * 2;
 
+   $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
+      if $self->{title};
+
    $self->child->configure ($self->border, $self->border, $w, $h);
 }
 
@@ -662,13 +800,13 @@
    if ($x < $self->{w} && $x >= $self->{w} - $border
        && $y < $self->{h} && $y >= $self->{h} - $border) {
 
-      my ($ox, $oy) = ($ev->button_x, $ev->button_y);
+      my ($ox, $oy) = ($ev->{x}, $ev->{y});
       my ($bw, $bh) = ($self->{w}, $self->{h});
 
       $self->{motion} = sub {
          my ($ev, $x, $y) = @_;
 
-         ($x, $y) = ($ev->motion_x, $ev->motion_y);
+         ($x, $y) = ($ev->{x}, $ev->{y});
 
          $self->{user_w} = $bw + $x - $ox;
          $self->{user_h} = $bh + $y - $oy;
@@ -678,13 +816,13 @@
    } elsif ($x >= 0 && $x < $self->{w}
             && $y >= 0 && $y < $border) {
 
-      my ($ox, $oy) = ($ev->button_x, $ev->button_y);
+      my ($ox, $oy) = ($ev->{x}, $ev->{y});
       my ($bx, $by) = ($self->{x}, $self->{y});
 
       $self->{motion} = sub {
          my ($ev, $x, $y) = @_;
 
-         ($x, $y) = ($ev->motion_x, $ev->motion_y);
+         ($x, $y) = ($ev->{x}, $ev->{y});
 
          $self->move ($bx + $x - $ox, $by + $y - $oy);
          $self->update;
@@ -739,6 +877,7 @@
    glDisable GL_TEXTURE_2D;
    glDisable GL_BLEND;
 
+   $self->{title}->draw if $self->{title};
    $self->child->draw;
 }
 
@@ -750,7 +889,7 @@
 
 use List::Util qw(max sum);
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my $class = shift;
@@ -774,7 +913,13 @@
 sub clear {
    my ($self) = @_;
 
-   delete $self->{children};
+   my $children = delete $self->{children};
+   
+   for (grep $_, map @$_, grep $_, @$children) {
+      delete $_->{parent};
+      $_->hide;
+   }
+
    $self->update;
 }
 
@@ -790,7 +935,7 @@
       for my $x (0 .. $#$row) {
          my $widget = $row->[$x]
             or next;
-         my ($w, $h) = $widget->size_request;
+         my ($w, $h) = @$widget{qw(req_w req_h)};
 
          $w[$x] = max $w[$x], $w;
          $h[$y] = max $h[$y], $h;
@@ -905,7 +1050,7 @@
 
    my $children = $self->{children};
 
-   my @h = map +($_->size_request)[0], @$children;
+   my @h = map $_->{req_w}, @$children;
 
    my $req_h = List::Util::sum @h;
 
@@ -963,7 +1108,7 @@
 
    my $children = $self->{children};
 
-   my @h = map +($_->size_request)[1], @$children;
+   my @h = map $_->{req_h}, @$children;
 
    my $req_h = List::Util::sum @h;
 
@@ -1001,23 +1146,29 @@
 
 our @ISA = CFClient::UI::Base::;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my ($class, %arg) = @_;
 
    my $self = $class->SUPER::new (
-      fg       => [1, 1, 1],
-      fontsize => 1,
-      text     => "",
-      align    => -1,
-      valign   => -1,
-      padding  => 2,
-      layout   => new CFClient::Layout,
+      fg         => [1, 1, 1],
+      #font      => default_font
+      fontsize   => 1,
+      text       => "",
+      align      => -1,
+      valign     => -1,
+      padding    => 2,
+      layout     => new CFClient::Layout,
+      can_events => 0,
       %arg
    );
 
-   $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
+   if (exists $self->{template}) {
+      my $layout = new CFClient::Layout;
+      $layout->set_text (delete $self->{template});
+      $self->{template} = $layout;
+   }
 
    $self->set_text   (delete $self->{text})   if exists $self->{text};
    $self->set_markup (delete $self->{markup}) if exists $self->{markup};
@@ -1025,7 +1176,7 @@
    $self
 }
 
-sub escape_text {
+sub escape {
    local $_ = $_[1];
 
    s/&/&amp;/g;
@@ -1041,6 +1192,7 @@
    $self->{layout}->set_text ($text);
 
    delete $self->{texture};
+   $self->check_size;
    $self->update;
 }
 
@@ -1050,17 +1202,29 @@
    $self->{layout}->set_markup ($markup);
 
    delete $self->{texture};
+   $self->check_size;
    $self->update;
 }
 
 sub size_request {
    my ($self) = @_;
 
-   $self->{layout}->set_width;
+   $self->{layout}->set_font ($self->{font}) if $self->{font};
+   $self->{layout}->set_width ($self->{max_w} || -1);
    $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
 
    my ($w, $h) = $self->{layout}->size;
 
+   if (exists $self->{template}) {
+      $self->{template}->set_font ($self->{font}) if $self->{font};
+      $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
+
+      my ($w2, $h2) = $self->{template}->size;
+
+      $w = List::Util::max $w, $w2;
+      $h = List::Util::max $h, $h2;
+   }
+
    (
       $w + $self->{padding} * 2,
       $h + $self->{padding} * 2,
@@ -1073,10 +1237,20 @@
    delete $self->{texture};
 }
 
+sub set_fontsize {
+   my ($self, $fontsize) = @_;
+
+   $self->{fontsize} = $fontsize;
+   delete $self->{texture};
+   $self->check_size;
+   $self->update;
+}
+
 sub _draw {
    my ($self) = @_;
 
    my $tex = $self->{texture} ||= do {
+      $self->{layout}->set_font ($self->{font}) if $self->{font};
       $self->{layout}->set_width ($self->{w});
       $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
       new_from_layout CFClient::Texture $self->{layout}
@@ -1113,20 +1287,20 @@
 
 our @ISA = CFClient::UI::Label::;
 
-use SDL;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my $class = shift;
 
    $class->SUPER::new (
-      fg        => [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,
-      valign    => 0,
+      fg         => [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,
+      valign     => 0,
+      can_events => 1,
       @_
    )
 }
@@ -1164,7 +1338,7 @@
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
-   $self->_set_text ($self->{text});
+   $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
 }
 
 sub set_text {
@@ -1178,26 +1352,25 @@
 sub key_down {
    my ($self, $ev) = @_;
 
-   my $mod = $ev->key_mod;
-   my $sym = $ev->key_sym;
-
-   my $uni = $ev->key_unicode;
+   my $mod = $ev->{mod};
+   my $sym = $ev->{sym};
+   my $uni = $ev->{unicode};
 
    my $text = $self->get_text;
 
-   if ($sym == SDLK_BACKSPACE) {
+   if ($sym == 8) {
       substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
-   } elsif ($sym == SDLK_DELETE) {
+   } elsif ($sym == 127) {
       substr $text, $self->{cursor}, 1, "";
-   } elsif ($sym == SDLK_LEFT) {
+   } elsif ($sym == CFClient::SDLK_LEFT) {
       --$self->{cursor} if $self->{cursor};
-   } elsif ($sym == SDLK_RIGHT) {
+   } elsif ($sym == CFClient::SDLK_RIGHT) {
       ++$self->{cursor} if $self->{cursor} < length $self->{text};
-   } elsif ($sym == SDLK_HOME) {
+   } elsif ($sym == CFClient::SDLK_HOME) {
       $self->{cursor} = 0;
-   } elsif ($sym == SDLK_END) {
+   } elsif ($sym == CFClient::SDLK_END) {
       $self->{cursor} = length $text;
-   } elsif ($sym == SDLK_ESCAPE) {
+   } elsif ($sym == 27) {
       $self->emit ('escape');
    } elsif ($uni) {
       substr $text, $self->{cursor}++, 0, chr $uni;
@@ -1282,15 +1455,14 @@
 
 our @ISA = CFClient::UI::EntryBase::;
 
-use SDL;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub key_down {
    my ($self, $ev) = @_;
 
-   my $sym = $ev->key_sym;
+   my $sym = $ev->{sym};
 
-   if ($sym == SDLK_RETURN) {
+   if ($sym == 13) {
       $self->emit (activate => $self->get_text);
       $self->update;
 
@@ -1306,24 +1478,24 @@
 
 our @ISA = CFClient::UI::Label::;
 
-use SDL;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 my @tex =
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          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 => [0, 0, 1],
-      can_hover => 1,
-      align     => 0,
-      valign    => 0,
+      padding    => 4,
+      fg         => [1, 1, 1],
+      bg         => [1, 1, 1, 0.2],
+      active_fg  => [0, 0, 1],
+      can_hover  => 1,
+      align      => 0,
+      valign     => 0,
+      can_events => 1,
       @_
    )
 }
@@ -1367,11 +1539,10 @@
 our @ISA = CFClient::UI::DrawBG::;
 
 my @tex =
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          qw(c1_checkbox_bg.png c1_checkbox_active.png);
 
-use SDL;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my $class = shift;
@@ -1427,28 +1598,91 @@
 
 #############################################################################
 
+package CFClient::UI::Image;
+
+our @ISA = CFClient::UI::Base::;
+
+use CFClient::OpenGL;
+use Carp qw/confess/;
+
+our %loaded_images;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (can_events => 0, @_);
+
+   $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
+
+   $loaded_images{$self->{image}} ||=
+      new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
+
+   my $tex = $self->{tex} = $loaded_images{$self->{image}};
+
+   Scalar::Util::weaken $loaded_images{$self->{image}};
+
+   $self->{aspect} = $tex->{w} / $tex->{h};
+
+   $self
+}
+
+sub size_request {
+   my ($self) = @_;
+
+   ($self->{tex}->{w}, $self->{tex}->{h})
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   my $tex = $self->{tex};
+
+   my ($w, $h) = ($self->{w}, $self->{h});
+
+   if ($self->{rot90}) {
+      glRotate 90, 0, 0, 1;
+      glTranslate 0, -$self->{w}, 0;
+
+      ($w, $h) = ($h, $w);
+   }
+
+   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;
+
+   $tex->draw_quad (0, 0, $w, $h);
+
+   glDisable GL_BLEND;
+   glDisable GL_TEXTURE_2D;
+}
+
+#############################################################################
+
 package CFClient::UI::VGauge;
 
 our @ISA = CFClient::UI::Base::;
 
-use SDL::OpenGL;
+use List::Util qw(min max);
+
+use CFClient::OpenGL;
 
 my %tex = (
    food => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
    ],
    grace => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
-         qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+         qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
    ],
    hp => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
    ],
    mana => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
-         qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+         qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
    ],
 );
 
@@ -1456,7 +1690,12 @@
 sub new {
    my $class = shift;
 
-   my $self = $class->SUPER::new (gauge => 'food', @_);
+   my $self = $class->SUPER::new (
+      type  => 'food',
+      @_
+   );
+
+   $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
 
    $self
 }
@@ -1464,9 +1703,9 @@
 sub size_request {
    my ($self) = @_;
 
-   my $tex = $tex{$self->{gauge}}[0];
-   
-   @$tex{qw(w h)}
+   #my $tex = $tex{$self->{type}}[0];
+   #@$tex{qw(w h)}
+   (0, 0)
 }
 
 sub set_max {
@@ -1490,55 +1729,115 @@
 sub _draw {
    my ($self) = @_;
 
-   my $tex = $tex{$self->{gauge}};
+   my $tex = $tex{$self->{type}};
+   my ($t1, $t2, $t3) = @$tex;
 
    my ($w, $h) = ($self->{w}, $self->{h});
 
+   if ($self->{vertical}) {
+      glRotate 90, 0, 0, 1;
+      glTranslate 0, -$self->{w}, 0;
+
+      ($w, $h) = ($h, $w);
+   }
+
    my $ycut = $self->{val} / ($self->{max_val} || 1);
-   $ycut = 1 if $self->{val} > $self->{max_val};
 
-   my $t1 = $tex->[0];
-   my $t2 = $tex->[1];
+   my $ycut1 = max 0, min 1, $ycut;
+   my $ycut2 = max 0, min 1, $ycut - 1;
+
+   my $h1 = $self->{h} * (1 - $ycut1);
+   my $h2 = $self->{h} * (1 - $ycut2);
 
    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 $h1 = $self->{h} - $ycut * $self->{h};
-   my $h2 = $ycut * $self->{h};
-
-   my $yp = 0;
-
    glBindTexture GL_TEXTURE_2D, $t1->{name};
    glBegin GL_QUADS;
-   glTexCoord 0       , 0;                      glVertex 0     , $yp;
-   glTexCoord 0       , $t1->{t} * (1 - $ycut); glVertex 0     , $yp + $h1;
-   glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;
-   glTexCoord $t1->{s}, 0;                      glVertex 0 + $w, $yp;
+   glTexCoord 0       , 0;                       glVertex 0 , 0;
+   glTexCoord 0       , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
+   glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
+   glTexCoord $t1->{s}, 0;                       glVertex $w, 0;
    glEnd;
 
-   $yp += $h1;
-
+   my $ycut1 = List::Util::min 1, $ycut;
    glBindTexture GL_TEXTURE_2D, $t2->{name};
    glBegin GL_QUADS;
-   glTexCoord 0       , $t2->{t} * (1 - $ycut); glVertex 0     , $yp;
-   glTexCoord 0       , $t2->{t};               glVertex 0     , $yp + $h2;
-   glTexCoord $t2->{s}, $t2->{t};               glVertex 0 + $w, $yp + $h2;
-   glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;
+   glTexCoord 0       , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
+   glTexCoord 0       , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
+   glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
+   glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
    glEnd;
 
+   if ($t3) {
+      glBindTexture GL_TEXTURE_2D, $t3->{name};
+      glBegin GL_QUADS;
+      glTexCoord 0       , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
+      glTexCoord 0       , $t3->{t};                glVertex 0 , $self->{h};
+      glTexCoord $t3->{s}, $t3->{t};                glVertex $w, $self->{h};
+      glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
+      glEnd;
+   }
+
    glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
 }
 
 #############################################################################
 
+package CFClient::UI::Gauge;
+
+our @ISA = CFClient::UI::VBox::;
+
+sub new {
+   my ($class, %arg) = @_;
+
+   my $self = $class->SUPER::new (
+      tooltip   => $arg{type},
+      can_hover => 1,
+      %arg,
+   );
+
+   $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
+   $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
+   $self->add ($self->{max}   = new CFClient::UI::Label valign => -1, align => 0, template => "999");
+
+   $self
+}
+
+sub set_fontsize {
+   my ($self, $fsize) = @_;
+
+   $self->{value}->set_fontsize ($fsize);
+   $self->{max}  ->set_fontsize ($fsize);
+}
+
+sub set_value {
+   my ($self, $val, $max) = @_;
+
+   $self->set_max ($max)
+      if defined $max;
+
+   $self->{gauge}->set_value ($val, $max);
+   $self->{value}->set_text ($val);
+}
+
+sub set_max {
+   my ($self, $max) = @_;
+
+   $self->{gauge}->set_max ($max);
+   $self->{max}->set_text ($max);
+}
+
+#############################################################################
+
 package CFClient::UI::Slider;
 
 use strict;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 our @ISA = CFClient::UI::DrawBG::;
 
@@ -1673,19 +1972,21 @@
 
 our @ISA = CFClient::UI::HBox::;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      fontsize => 1,
+      fontsize   => 1,
+      can_events => 0,
+      #font      => default_font
       @_,
-
-      layout   => (new CFClient::Layout),
-      par      => [],
-      height   => 0,
-      children => [
+                 
+      layout     => (new CFClient::Layout),
+      par        => [],
+      height     => 0,
+      children   => [
          (new CFClient::UI::Empty expand => 1),
          (new CFClient::UI::Slider vertical => 1),
       ],
@@ -1729,6 +2030,7 @@
 
    $self->SUPER::size_allocate ($w, $h);
 
+   $self->{layout}->set_font ($self->{font}) if $self->{font};
    $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
    $self->{layout}->set_width ($self->{children}[0]{w});
 
@@ -1791,6 +2093,8 @@
 
          my $layout = $self->{layout};
 
+         $layout->set_font ($self->{font}) if $self->{font};
+
          for my $par (@{$self->{par}}) {
             my $h = $par->[0];
 
@@ -1827,245 +2131,9 @@
 
 #############################################################################
 
-package CFClient::UI::MapWidget;
-
-use strict;
-
-use List::Util qw(min max);
-
-use SDL;
-use SDL::OpenGL;
-
-our @ISA = CFClient::UI::Base::;
-
-sub new {
-   my $class = shift;
-
-   $class->SUPER::new (
-      z         => -1,
-      can_focus => 1,
-      list      => (glGenLists 1),
-      @_
-   )
-}
-
-sub key_down {
-   print "MAPKEYDOWN\n";
-}
-
-sub key_up {
-}
-
-sub button_down {
-   my ($self, $ev, $x, $y) = @_;
-
-   $self->focus_in;
-
-   if ($ev->button == 2) {
-      my ($ox, $oy) = ($ev->button_x, $ev->button_y);
-      my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
-
-      $self->{motion} = sub {
-         my ($ev, $x, $y) = @_;
-
-         ($x, $y) = ($ev->motion_x, $ev->motion_y);
-
-         $::CFG->{map_shift_x} = $bw + $x - $ox;
-         $::CFG->{map_shift_y} = $bh + $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 size_request {
-   (
-      1 + 32 * int $::WIDTH  / 32,
-      1 + 32 * int $::HEIGHT / 32,
-   )
-}
-
-sub update {
-   my ($self) = @_;
-
-   $self->{need_update} = 1;
-   $self->SUPER::update;
-}
-
-sub draw {
-   my ($self) = @_;
-
-   if (delete $self->{need_update}) {
-      glNewList $self->{list}, GL_COMPILE;
-
-      if ($::MAP) {
-         my $sw = int $::WIDTH  / 32;
-         my $sh = int $::HEIGHT / 32;
-
-         my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
-         my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
-
-         glTranslate $sx0 - 32, $sy0 - 32, 0;
-
-         my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
-
-         if ($::CFG->{fow_enable}) {
-            if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # 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;
-            }
-
-            $self->{fow_texture} = 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;
-            glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-            glEnable GL_TEXTURE_2D;
-            glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
-
-            glColor +($::CFG->{fow_intensity}) x 3, 1;
-            $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
-
-            glDisable GL_TEXTURE_2D;
-            glDisable GL_BLEND;
-         }
-
-         # HACK BEGIN
-         {
-           glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
-           my ($w, $h) = (250, 250);
-
-           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;
-
-           $self->{mapmap_texture} =
-              new CFClient::Texture
-                 w    => $w,
-                 h    => $h,
-                 data => $::MAP->mapmap ($w, $h),
-                 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
-
-           $self->{mapmap_texture}->draw_quad (100, 100);
-
-           glDisable GL_TEXTURE_2D;
-           glDisable GL_BLEND;
-         }
-         # HACK END
-      }
-
-      glEndList;
-   }
-
-   glPushMatrix;
-   glCallList $self->{list};
-   glPopMatrix;
-
-   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 = (
-   SDLK_KP8, [1, "north"],
-   SDLK_KP9, [2, "northeast"],
-   SDLK_KP6, [3, "east"],
-   SDLK_KP3, [4, "southeast"],
-   SDLK_KP2, [5, "south"],
-   SDLK_KP1, [6, "southwest"],
-   SDLK_KP4, [7, "west"],
-   SDLK_KP7, [8, "northwest"],
-
-   SDLK_UP,    [1, "north"],
-   SDLK_RIGHT, [3, "east"],
-   SDLK_DOWN,  [5, "south"],
-   SDLK_LEFT,  [7, "west"],
-);
-
-sub key_down {
-   my ($self, $ev) = @_;
-
-   my $mod = $ev->key_mod;
-   my $sym = $ev->key_sym;
-
-   if ($sym == SDLK_KP5) {
-      $::CONN->user_send ("stay fire");
-   } elsif ($sym == SDLK_a) {
-      $::CONN->user_send ("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->user_send ("fire $DIR{$sym}[0]");
-      } elsif ($mod & KMOD_CTRL) {
-         $self->{ctrl}++;
-         $::CONN->user_send ("run $DIR{$sym}[0]");
-      } else {
-         $::CONN->user_send ("$DIR{$sym}[1]");
-      }
-   }
-}
-
-sub key_up {
-   my ($self, $ev) = @_;
-
-   my $mod = $ev->key_mod;
-   my $sym = $ev->key_sym;
-
-   if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
-      $::CONN->user_send ("fire_stop");
-   }
-   if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
-      $::CONN->user_send ("run_stop");
-   }
-}
-
-#############################################################################
-
 package CFClient::UI::Animator;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 our @ISA = CFClient::UI::Bin::;
 
@@ -2113,7 +2181,7 @@
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      state => 0,
+      state            => 0,
       connect_activate => \&toggle_flopper,
       @_
    );
@@ -2144,16 +2212,125 @@
 
 #############################################################################
 
+package CFClient::UI::Tooltip;
+
+our @ISA = CFClient::UI::Bin::;
+
+use CFClient::OpenGL;
+
+sub new {
+   my $class = shift;
+
+   $class->SUPER::new (
+      @_,
+      can_events => 0,
+   )
+}
+
+sub set_markup {
+   my ($self, $text) = @_;
+
+   $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
+   $self->{label}->set_markup ($text);
+   $self->add ($self->{label});
+}
+
+sub size_request {
+   my ($self) = @_;
+
+   $self->child->set_max_size ($::WIDTH * 0.3);
+
+   my ($w, $h) = @{$self->child}{qw(req_w req_h)};
+
+   ($w + 4, $h + 4)
+}
+
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->SUPER::size_allocate ($w - 4, $h - 4);
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   glPushMatrix;
+   glTranslate 0.375, 0.375;
+
+   my ($w, $h) = @$self{qw(w h)};
+
+   glColor 1, 0.8, 0.4;
+   glBegin GL_QUADS;
+   glVertex 0 , 0;
+   glVertex 0 , $h;
+   glVertex $w, $h;
+   glVertex $w, 0;
+   glEnd;
+   
+   glColor 0, 0, 0;
+   glBegin GL_LINE_LOOP;
+   glVertex 0 , 0;
+   glVertex 0 , $h;
+   glVertex $w, $h;
+   glVertex $w, 0;
+   glEnd;
+   
+   glPopMatrix;
+
+   glTranslate 2, 2;
+   $self->SUPER::_draw;
+}
+
+#############################################################################
+
+package CFClient::UI::Face;
+
+our @ISA = CFClient::UI::Base::;
+
+use CFClient::OpenGL;
+
+sub new {
+   my $class = shift;
+
+   $class->SUPER::new (
+      aspect => 1,
+      @_,
+   )
+}
+
+sub size_request {
+   (32, 8)
+}
+
+sub draw {
+   my ($self) = @_;
+
+   my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
+
+   if ($tex) {
+      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;
+      glColor 1, 1, 1, 1;
+      $tex->draw_quad (0, 0, $self->{w}, $self->{h});
+      glDisable GL_TEXTURE_2D;
+      glDisable GL_BLEND;
+   }
+}
+
+#############################################################################
+
 package CFClient::UI::Root;
 
 our @ISA = CFClient::UI::Container::;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub check_size {
    my ($self) = @_;
 
-   $self->configure (0, 0, $::WITH, $::HEIGHT);
+   $self->configure (0, 0, $::WIDTH, $::HEIGHT);
 }
 
 sub size_request {
@@ -2165,8 +2342,13 @@
 
    $self->SUPER::configure ($x, $y, $w, $h);
 
-   $_->configure ($_->{x}, $_->{y}, $_->size_request)
-      for @{$self->{children}};
+   for my $child (@{$self->{children}}) {
+      my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
+
+      $X = List::Util::max 0, List::Util::min $w - $W, $X;
+      $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
+      $child->configure ($X, $Y, $W,$H);
+   }
 }
 
 sub _topleft {
@@ -2185,6 +2367,10 @@
 sub add {
    my ($self, $child) = @_;
 
+   # integerize window positions
+   $child->{x} = int $child->{x};
+   $child->{y} = int $child->{y};
+
    $self->SUPER::add ($child);
 }
 
@@ -2219,6 +2405,7 @@
 package CFClient::UI;
 
 $ROOT = new CFClient::UI::Root;
+$TOOLTIP = new CFClient::UI::Tooltip;
 
 1