--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/23 00:57:39	1.151
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/24 03:19:42	1.159
@@ -20,6 +20,11 @@
 
             if ($TOOLTIP->{owner} != $widget) {
                $TOOLTIP->{owner} = $widget;
+
+               my $tip = $widget->{tooltip};
+
+               $tip = $tip->($widget) if CODE:: eq ref $tip;
+               
                $TOOLTIP->set_text ($widget->{tooltip});
                $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
                $TOOLTIP->show;
@@ -139,6 +144,13 @@
    $self
 }
 
+sub destroy {
+   my ($self) = @_;
+
+   $self->hide;
+   %$self = ();
+}
+
 sub show {
    my ($self) = @_;
 
@@ -165,8 +177,13 @@
    $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 {
@@ -208,6 +225,13 @@
    # 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) = @_;
@@ -327,15 +351,26 @@
 sub check_size {
    my ($self) = @_;
 
-   return unless $self->{parent};
+   $self->{parent}
+      or return 1;
 
-   my ($w, $h) = $self->size_request;
+   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;
+      $self->{parent}->check_size
+         or $self->size_allocate (
+               (List::Util::max $self->{w}, $w),
+               (List::Util::max $self->{h}, $h),
+            );
+
+      1
+   } else {
+      0
    }
 }
 
@@ -635,25 +670,6 @@
    $self
 }
 
-sub set_size {
-   my ($self, $w, $h) = @_;
-   $self->{req_w} = $w;
-   $self->{req_h} = $h;
-   $self->check_size;
-}
-
-sub size_request {
-   my ($self) = @_;
-   ($self->{req_w}, $self->{req_h})
-}
-
-sub size_allocate {
-   my ($self, $w, $h) = @_;
-   $self->{w} = $w;
-   $self->{h} = $h;
-   $self->child->configure (0, 0, $w, $h);
-}
-
 sub _draw {
    my ($self) = @_;
 
@@ -719,8 +735,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;
 
    (
@@ -1096,6 +1110,7 @@
 
    my $self = $class->SUPER::new (
       fg       => [1, 1, 1],
+      #font    => default_font
       fontsize => 1,
       text     => "",
       align    => -1,
@@ -1151,12 +1166,14 @@
 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;
@@ -1181,13 +1198,16 @@
    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}
@@ -1600,6 +1620,8 @@
 
 our @ISA = CFClient::UI::Base::;
 
+use List::Util qw(min max);
+
 use CFClient::OpenGL;
 
 my %tex = (
@@ -1609,7 +1631,7 @@
    ],
    grace => [
       map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
-         qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
+         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 $_, mipmap => 1 }
@@ -1617,7 +1639,7 @@
    ],
    mana => [
       map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
-         qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
+         qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
    ],
 );
 
@@ -1665,6 +1687,7 @@
    my ($self) = @_;
 
    my $tex = $tex{$self->{type}};
+   my ($t1, $t2, $t3) = @$tex;
 
    my ($w, $h) = ($self->{w}, $self->{h});
 
@@ -1676,35 +1699,45 @@
    }
 
    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};
-
    glBindTexture GL_TEXTURE_2D, $t1->{name};
    glBegin GL_QUADS;
-   glTexCoord 0       , 0;                      glVertex 0 , 0;
-   glTexCoord 0       , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
-   glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
-   glTexCoord $t1->{s}, 0;                      glVertex $w, 0;
+   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;
 
+   my $ycut1 = List::Util::min 1, $ycut;
    glBindTexture GL_TEXTURE_2D, $t2->{name};
    glBegin GL_QUADS;
-   glTexCoord 0       , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
-   glTexCoord 0       , $t2->{t};               glVertex 0 , $h1 + $h2;
-   glTexCoord $t2->{s}, $t2->{t};               glVertex $w, $h1 + $h2;
-   glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
+   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;
 }
@@ -1723,9 +1756,9 @@
       %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);
-   $self->add ($self->{max}   = new CFClient::UI::Label valign => -1, align => 0, template => "999");
+   $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1);
+   $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1);
+   $self->add ($self->{max}   = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1);
 
    $self
 }
@@ -1902,6 +1935,7 @@
 
    my $self = $class->SUPER::new (
       fontsize => 1,
+      #font    => default_font
       @_,
 
       layout   => (new CFClient::Layout),
@@ -1951,6 +1985,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});
 
@@ -2013,6 +2048,8 @@
 
          my $layout = $self->{layout};
 
+         $layout->set_font ($self->{font}) if $self->{font};
+
          for my $par (@{$self->{par}}) {
             my $h = $par->[0];
 
@@ -2131,6 +2168,71 @@
 
 #############################################################################
 
+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_text {
+   my ($self, $text) = @_;
+
+   $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
+   $self->{label}->set_text ($text);
+   $self->add ($self->{label});
+}
+
+sub size_request {
+   my ($self) = @_;
+
+   $self->child->set_max_size ($::WIDTH * 0.2);
+
+   my ($w, $h) = @{$self->child}{qw(req_w req_h)};
+
+   ($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::Root;
 
 our @ISA = CFClient::UI::Container::;
@@ -2215,7 +2317,7 @@
 package CFClient::UI;
 
 $ROOT = new CFClient::UI::Root;
-$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0;
+$TOOLTIP = new CFClient::UI::Tooltip;
 
 1