--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/17 19:36:27	1.122
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/18 02:04:23	1.131
@@ -114,9 +114,12 @@
 
 sub move {
    my ($self, $x, $y, $z) = @_;
+
    $self->{x} = int $x;
    $self->{y} = int $y;
    $self->{z} = $z if defined $z;
+
+   $self->update;
 }
 
 sub needs_redraw {
@@ -128,7 +131,7 @@
    Carp::confess "size_request is abtract";
 }
 
-sub _size_allocate {
+sub configure {
    my ($self, $x, $y, $w, $h) = @_;
 
    $self->{x} = $x;
@@ -139,13 +142,11 @@
    $self->{w} = $w;
    $self->{h} = $h;
 
-   1
+   $self->size_allocate ($w, $h);
 }
 
 sub size_allocate {
-   my ($self, $x, $y, $w, $h) = @_;
-
-   $self->_size_allocate ($x, $y, $w, $h);
+   # nothing to be done
 }
 
 # return top left coordinates
@@ -262,6 +263,23 @@
    Scalar::Util::weaken ($self->{parent} = $parent);
 }
 
+sub check_size {
+   my ($self) = @_;
+
+   my ($w, $h) = $self->size_request;
+
+   if ($w != $self->{req_w}  || $h != $self->{req_h}) {
+      $self->{req_w} = $w;
+      $self->{req_h} = $h;
+
+      $self->{parent}->check_size
+         if $self->{parent};
+
+      $self->size_allocate ($w, $h);
+      $self->update;
+   }
+}
+
 sub update {
    my ($self) = @_;
 
@@ -370,7 +388,8 @@
    ];
 
    $self->{w} = $self->{h} = -1;
-   $self->update;
+
+   $child->check_size;
 }
 
 sub remove {
@@ -378,7 +397,7 @@
 
    $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
 
-   $self->size_allocate (0, 0, $self->{w}, $self->{h});
+   $self->check_size;
 }
 
 sub find_widget {
@@ -441,11 +460,9 @@
 }
 
 sub size_allocate {
-   my ($self, $x, $y, $w, $h) = @_;
+   my ($self, $w, $h) = @_;
 
-   $self->_size_allocate ($x, $y, $w, $h) or return;
-
-   $self->{children}[0]->size_allocate (0, 0, $w, $h);
+   $self->{children}[0]->configure (0, 0, $w, $h);
 }
 
 #############################################################################
@@ -481,11 +498,9 @@
 }
 
 sub size_allocate {
-   my ($self, $x, $y, $w, $h) = @_;
-
-   $self->_size_allocate ($x, $y, $w, $h) or return;
+   my ($self, $w, $h) = @_;
 
-   $self->child->size_allocate (0, 0, $w, $h);
+   $self->child->configure (0, 0, $w, $h);
 
    $self->render_chld;
 }
@@ -511,6 +526,30 @@
 
 #############################################################################
 
+package CFClient::UI::ViewPort;
+
+our @ISA = CFClient::UI::Window::;
+
+sub new { die }
+
+sub size_request {
+   my ($self) = @_;
+
+   @$self{qw(child_w child_h)} = $self->child->size_request;
+   $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
+
+   @$self{qw(child_w child_h)}
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   $self->{children}[1]->draw;
+}
+
+
+#############################################################################
+
 package CFClient::UI::Frame;
 
 our @ISA = CFClient::UI::Bin::;
@@ -530,9 +569,7 @@
 sub size_allocate {
    my ($self, $x, $y, $w, $h) = @_;
    
-   $self->_size_allocate ($x, $y, $w, $h) or return;
-
-   $self->child->size_allocate (2, 2, $w - 4, $h - 4);
+   $self->child->configure (2, 2, $w - 4, $h - 4);
 }
 
 sub _draw {
@@ -592,14 +629,12 @@
 }
 
 sub size_allocate {
-   my ($self, $x, $y, $w, $h) = @_;
-
-   $self->_size_allocate ($x, $y, $w, $h) or return;
+   my ($self, $w, $h) = @_;
 
    $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);
+   $self->child->configure ($self->{border}, $self->{border}, $w, $h);
 }
 
 sub button_down {
@@ -618,7 +653,7 @@
 
          $self->{user_w} = $bw + $x - $ox;
          $self->{user_h} = $bh + $y - $oy;
-         $self->update;
+         $self->check_size;
       };
 
    } elsif ($x >= 0 && $x < $self->{w}
@@ -712,7 +747,8 @@
    $self->{children}[$y][$x] = $child;
 
    $self->{w} = $self->{h} = -1;
-   $self->update;
+
+   $child->check_size;
 }
 
 # TODO: move to container class maybe? send childs a signal on removal?
@@ -757,9 +793,7 @@
 }
 
 sub size_allocate {
-   my ($self, $x, $y, $w, $h) = @_;
-
-   $self->_size_allocate ($x, $y, $w, $h) or return;
+   my ($self, $w, $h) = @_;
 
    my ($ws, $hs) = $self->get_wh;
 
@@ -791,7 +825,7 @@
          my $col_w = $ws->[$c];
 
          if (my $widget = $row->[$c]) {
-            $widget->size_allocate ($x, $y, $col_w, $row_h);
+            $widget->configure ($x, $y, $col_w, $row_h);
          }
 
          $x += $col_w;
@@ -846,9 +880,7 @@
 }
 
 sub size_allocate {
-   my ($self, $x, $y, $w, $h) = @_;
-
-   $self->_size_allocate ($x, $y, $w, $h);
+   my ($self, $w, $h) = @_;
 
    ($h, $w) = ($w, $h);
 
@@ -880,10 +912,12 @@
    for (0 .. $#$children) {
       my $child = $children->[$_];
       my $h = $h[$_];
-      $child->size_allocate ($y, 0, $h, $w);
+      $child->configure ($y, 0, $h, $w);
 
       $y += $h;
    }
+
+   1
 }
 
 #############################################################################
@@ -906,9 +940,7 @@
 }
 
 sub size_allocate {
-   my ($self, $x, $y, $w, $h) = @_;
-
-   $self->_size_allocate ($x, $y, $w, $h);
+   my ($self, $w, $h) = @_;
 
    my $children = $self->{children};
 
@@ -936,10 +968,12 @@
    for (0 .. $#$children) {
       my $child = $children->[$_];
       my $h = $h[$_];
-      $child->size_allocate (0, $y, $w, $h);
+      $child->configure (0, $y, $w, $h);
 
       $y += $h;
    }
+
+   1
 }
 
 #############################################################################
@@ -1015,9 +1049,7 @@
 }
 
 sub size_allocate {
-   my ($self, $x, $y, $w, $h) = @_;
-
-   $self->_size_allocate ($x, $y, $w, $h) or return;
+   my ($self, $w, $h) = @_;
 
    delete $self->{texture};
 }
@@ -1116,9 +1148,7 @@
 }
 
 sub size_allocate {
-   my ($self, $x, $y, $w, $h) = @_;
-
-   $self->SUPER::size_allocate ($x, $y, $w, $h);
+   my ($self, $w, $h) = @_;
 
    $self->_set_text ($self->{text});
 }
@@ -1276,8 +1306,10 @@
       padding   => 4,
       fg        => [1, 1, 1],
       bg        => [1, 1, 1, 0.2],
-      active_fg => [1, 1, 0],
+      active_fg => [0, 0, 1],
       can_hover => 1,
+      align     => 0,
+      valign    => 0,
       @_
    )
 }
@@ -1346,12 +1378,6 @@
    ($self->{padding} * 2 + 6) x 2
 }
 
-sub size_allocate {
-   my ($self, $x, $y, $w, $h) = @_;
-
-   $self->_size_allocate ($x, $y, $w, $h);
-}
-
 sub button_down {
    my ($self, $ev, $x, $y) = @_;
 
@@ -1387,6 +1413,113 @@
 
 #############################################################################
 
+package CFClient::UI::VGauge;
+
+our @ISA = CFClient::UI::Base::;
+
+use SDL::OpenGL;
+
+my %tex = (
+   food => [
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+         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/
+   ],
+   hp => [
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+         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/
+   ],
+);
+
+# eg. VGauge->new (gauge => 'food'), default gauge: food
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (gauge => 'food', @_);
+
+   $self
+}
+
+sub size_request {
+   my ($self) = @_;
+
+   my $tex = $tex{$self->{gauge}}[0];
+   
+   @$tex{qw(w h)}
+}
+
+sub set_max {
+   my ($self, $max) = @_;
+
+   $self->{max_val} = $max;
+}
+
+sub set_value {
+   my ($self, $val, $max) = @_;
+
+   $self->set_max ($max)
+      if defined $max;
+
+   $max = $self->{max_val};
+   $self->{val} = $val;
+
+   $self->update;
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   my $tex = $tex{$self->{gauge}};
+
+   my ($w, $h) = ($self->{w}, $self->{h});
+
+   my $ycut = $self->{val} / ($self->{max_val} || 1);
+   $ycut = 1 if $self->{val} > $self->{max_val};
+
+   my $t1 = $tex->[0];
+   my $t2 = $tex->[1];
+
+   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;
+   glEnd;
+
+   $yp += $h1;
+
+   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;
+   glEnd;
+
+   glDisable GL_BLEND;
+   glDisable GL_TEXTURE_2D;
+}
+
+#############################################################################
+
 package CFClient::UI::Slider;
 
 use strict;
@@ -1586,14 +1719,13 @@
 }
 
 sub size_allocate {
-   my ($self, $x, $y, $w, $h) = @_;
-
-   $self->SUPER::size_allocate ($x, $y, $w, $h);
+   my ($self, $w, $h) = @_;
 
    $self->{layout}->set_height ($self->{fontsize});
    $self->{layout}->set_width ($self->{w});
 
    $self->reflow;
+   $self->update;
 }
 
 sub add_paragraph {
@@ -1784,8 +1916,8 @@
 
          if ($::CFG->{fow_enable}) {
             if ($::CFG->{fow_smooth}) { # smooth fog of war
-               glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
-               glConvolutionFilter2D
+               glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
+               glConvolutionFilter2D (
                   GL_CONVOLUTION_2D,
                   GL_ALPHA,
                   3, 3,
@@ -1794,7 +1926,7 @@
                      0.1, 0.1, 0.1,
                      0.1, 0.2, 0.1,
                      0.1, 0.1, 0.1,
-               ;
+               );
                glEnable GL_CONVOLUTION_2D;
             }
 
@@ -1834,7 +1966,7 @@
                  w    => $w,
                  h    => $h,
                  data => $::MAP->mapmap ($w, $h),
-                 type => GL_UNSIGNED_INT_8_8_8_8_REV;
+                 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
 
            $self->{mapmap_texture}->draw_quad (100, 100);
 
@@ -2011,16 +2143,22 @@
 
 use SDL::OpenGL;
 
+sub check_size {
+   my ($self) = @_;
+
+   $self->configure (0, 0, $::WITH, $::HEIGHT);
+}
+
 sub size_request {
    ($::WIDTH, $::HEIGHT)
 }
 
-sub size_allocate {
+sub configure {
    my ($self, $x, $y, $w, $h) = @_;
 
-   $self->_size_allocate ($x, $y, $w, $h);
+   $self->SUPER::configure ($x, $y, $w, $h);
 
-   $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
+   $_->configure ($_->{x}, $_->{y}, $_->size_request)
       for @{$self->{children}};
 }
 
@@ -2033,16 +2171,14 @@
 sub update {
    my ($self) = @_;
 
-   $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
+   $self->check_size;
    ::refresh ();
 }
 
 sub add {
-   my ($self, $widget) = @_;
-
-   $self->SUPER::add ($widget);
+   my ($self, $child) = @_;
 
-   $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
+   $self->SUPER::add ($child);
 }
 
 sub on_refresh {