--- deliantra/Deliantra-Client/DC/UI.pm	2006/06/05 01:22:08	1.280
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/06/05 21:43:56	1.289
@@ -5,6 +5,7 @@
 
 use Scalar::Util ();
 use List::Util ();
+use Event;
 
 use CFClient;
 use CFClient::Texture;
@@ -18,32 +19,7 @@
 
 our %WIDGET; # all widgets, weak-referenced
 
-sub get_layout {
-   my $layout;
-
-   for (grep { $_->{name} } values %WIDGET) {
-      my $win = $layout->{$_->{name}} = { };
-      
-      $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH   if $_->{x} =~ /^[0-9.]+$/;
-      $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT  if $_->{y} =~ /^[0-9.]+$/;
-      $win->{w} = $_->{w} / $::WIDTH                     if defined $_->{w};
-      $win->{h} = $_->{h} / $::HEIGHT                    if defined $_->{h};
-
-      $win->{show} = $_->{visible} && $_->{is_toplevel};
-   }
-
-   $layout
-}
-
-sub set_layout {
-   my ($layout) = @_;
-
-   $LAYOUT = $layout;
-}
-
-sub check_tooltip {
-   return if $ENV{CFPLUS_DEBUG} & 8;
-
+our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
    if (!$GRAB) {
       for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
          if (length $widget->{tooltip}) {
@@ -52,6 +28,8 @@
 
                $TOOLTIP->{owner} = $widget;
 
+               return if $ENV{CFPLUS_DEBUG} & 8;
+
                my $tip = $widget->{tooltip};
 
                $tip = $tip->($widget) if CODE:: eq ref $tip;
@@ -67,6 +45,29 @@
 
    $TOOLTIP->hide;
    delete $TOOLTIP->{owner};
+});
+
+sub get_layout {
+   my $layout;
+
+   for (grep { $_->{name} } values %WIDGET) {
+      my $win = $layout->{$_->{name}} = { };
+      
+      $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH   if $_->{x} =~ /^[0-9.]+$/;
+      $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT  if $_->{y} =~ /^[0-9.]+$/;
+      $win->{w} = $_->{w} / $::WIDTH                     if defined $_->{w};
+      $win->{h} = $_->{h} / $::HEIGHT                    if defined $_->{h};
+
+      $win->{show} = $_->{visible} && $_->{is_toplevel};
+   }
+
+   $layout
+}
+
+sub set_layout {
+   my ($layout) = @_;
+
+   $LAYOUT = $layout;
 }
 
 # class methods for events
@@ -90,7 +91,7 @@
       $GRAB = $widget;
       $GRAB->update if $GRAB;
 
-      check_tooltip;
+      $TOOLTIP_WATCHER->cb->();
    }
 
    $BUTTON_STATE |= 1 << ($ev->{button} - 1);
@@ -115,7 +116,7 @@
       $grab->update if $grab;
       $GRAB->update if $GRAB;
 
-      check_tooltip;
+      $TOOLTIP_WATCHER->cb->();
    }
 }
 
@@ -131,7 +132,7 @@
       $hover->update if $hover && $hover->{can_hover};
       $HOVER->update if $HOVER && $HOVER->{can_hover};
 
-      check_tooltip;
+      $TOOLTIP_WATCHER->start;
    }
 
    $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
@@ -279,7 +280,7 @@
    undef $GRAB  if $GRAB  == $self;
    undef $HOVER if $HOVER == $self;
 
-   CFClient::UI::check_tooltip
+   $CFClient::UI::TOOLTIP_WATCHER->cb->()
       if $TOOLTIP->{owner} == $self;
 
    $self->focus_out;
@@ -383,8 +384,8 @@
 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;
+   $self->{max_w} = int $w if defined $w;
+   $self->{max_h} = int $h if defined $h;
 
    $self->realloc;
 }
@@ -401,7 +402,7 @@
 
    if ($CFClient::UI::TOOLTIP->{owner} == $self) {
       delete $CFClient::UI::TOOLTIP->{owner};
-      CFClient::UI::check_tooltip;
+      $CFClient::UI::TOOLTIP_WATCHER->cb->();
    }
 }
 
@@ -1540,6 +1541,13 @@
    $self->SUPER::update;
 }
 
+sub realloc {
+   my ($self) = @_;
+
+   delete $self->{ox};
+   $self->SUPER::realloc;
+}
+
 sub set_text {
    my ($self, $text) = @_;
 
@@ -1549,6 +1557,7 @@
    $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
    $self->{layout}->set_text ($text);
 
+   delete $self->{size_req};
    $self->realloc;
    $self->update;
 }
@@ -1564,6 +1573,7 @@
    $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
    $self->{layout}->set_markup ($markup);
 
+   delete $self->{size_req};
    $self->realloc;
    $self->update;
 }
@@ -1571,25 +1581,29 @@
 sub size_request {
    my ($self) = @_;
 
-   $self->{layout}->set_font ($self->{font}) if $self->{font};
-   $self->{layout}->set_width ($self->{max_w} || -1);
-   $self->{layout}->set_ellipsise ($self->{ellipsise});
-   $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
-   $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
+   $self->{size_req} ||= do {
+      $self->{layout}->set_font ($self->{font}) if $self->{font};
+      $self->{layout}->set_width ($self->{max_w} || -1);
+      $self->{layout}->set_ellipsise ($self->{ellipsise});
+      $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
+      $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
 
-   my ($w, $h) = $self->{layout}->size;
+      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);
+      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;
+         my ($w2, $h2) = $self->{template}->size;
 
-      $w = List::Util::max $w, $w2;
-      $h = List::Util::max $h, $h2;
-   }
+         $w = List::Util::max $w, $w2;
+         $h = List::Util::max $h, $h2;
+      }
 
-   ($w, $h)
+      [$w, $h]
+   };
+
+   @{ $self->{size_req} }
 }
 
 sub size_allocate {
@@ -1610,6 +1624,14 @@
    $self->realloc;
 }
 
+sub reconfigure {
+   my ($self) = @_;
+
+   delete $self->{size_req};
+
+   $self->SUPER::reconfigure;
+}
+
 sub _draw {
    my ($self) = @_;
 
@@ -1637,12 +1659,15 @@
    };
 
    glEnable GL_TEXTURE_2D;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-
-   glColor_premultiply @{$self->{fg}}
-      if $tex->{format} == GL_ALPHA;
 
-   $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
+   if ($tex->{format} == GL_ALPHA) {
+      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+      glColor @{$self->{fg}};
+      $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
+   } else {
+      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+      $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
+   }
 
    glDisable GL_TEXTURE_2D;
 }
@@ -1684,8 +1709,11 @@
 
    $text =~ s/./*/g if $self->{hidden};
    $self->{layout}->set_text ("$text ");
+   delete $self->{size_req};
 
    $self->_emit (changed => $self->{text});
+
+   $self->realloc;
    $self->update;
 }
 
@@ -1694,8 +1722,6 @@
 
    $self->{cursor} = length $text;
    $self->_set_text ($text);
-
-   $self->realloc;
 }
 
 sub get_text {
@@ -3078,10 +3104,7 @@
 
    Scalar::Util::weaken (my $this = $self);
 
-   $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
-      $this->reorder;
-      $this->update;
-   });
+   $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
 
    $self
 }
@@ -3090,6 +3113,11 @@
    my ($self) = @_;
    my $NOW = Time::HiRes::time;
 
+   # freeze display when hovering over any label
+   return if $CFClient::UI::TOOLTIP->{owner}
+             && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
+                   values %{ $self->{item} };
+
    while (my ($k, $v) = each %{ $self->{item} }) {
       delete $self->{item}{$k} if $v->{timeout} < $NOW;
    }
@@ -3107,7 +3135,7 @@
    for my $item (@items) {
       last unless --$count;
 
-      push @widgets, $item->{label} ||= do {
+      my $label = $item->{label} ||= do {
          # TODO: doesn't handle markup well (read as: at all)
          my $short = $item->{count} > 1
                      ? "<b>$item->{count} ×</b> $item->{text}"
@@ -3125,21 +3153,22 @@
             tooltip_width => 0.67,
             fontsize      => $item->{fontsize} || $self->{fontsize},
             max_w         => $::WIDTH * 0.44,
-            fg            => $item->{fg},
-            orig_alpha    => $item->{fg}[3] || 1,
+            fg            => [@{ $item->{fg} }],
             can_events    => 1,
             can_hover     => 1
       };
 
       if ((my $diff = $item->{timeout} - $NOW) < 2) {
-         $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
-         if ($diff < 1) {
-            $item->{label}{max_h} = $item->{label}{req_h} * $diff;
-            $item->{label}->realloc;
-         }
-         $item->{label}->update;
+         $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
+         $label->update;
+         $label->set_max_size (undef, $label->{req_h} * $diff)
+            if $diff < 1;
          $self->{timer}->interval (1/30);
+      } else {
+         $label->{fg}[3] = $item->{fg}[3] || 1;
       }
+
+      push @widgets, $label;
    }
 
    $self->clear;