--- deliantra/Deliantra-Client/DC/UI.pm	2007/10/08 16:10:14	1.441
+++ deliantra/Deliantra-Client/DC/UI.pm	2007/12/26 20:09:38	1.452
@@ -4,7 +4,6 @@
 use strict;
 
 use List::Util ();
-use Event;
 
 use CFPlus;
 use CFPlus::Pod;
@@ -19,7 +18,9 @@
 
 our %WIDGET; # all widgets, weak-referenced
 
-our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
+our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
+   $_[0]->stop;
+
    if (!$GRAB) {
       for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
          if (length $widget->{tooltip}) {
@@ -44,7 +45,7 @@
    $TOOLTIP->hide;
    $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
    delete $TOOLTIP->{owner};
-});
+};
 
 sub get_layout {
    my $layout;
@@ -89,7 +90,7 @@
       $hover->update if $hover && $hover->{can_hover};
       $HOVER->update if $HOVER && $HOVER->{can_hover};
 
-      $TOOLTIP_WATCHER->start;
+      $TOOLTIP_WATCHER->again;
    }
 }
 
@@ -105,7 +106,7 @@
       $GRAB = $widget;
       $GRAB->update if $GRAB;
 
-      $TOOLTIP_WATCHER->cb->();
+      $TOOLTIP_WATCHER->invoke;
    }
 
    if ($GRAB) {
@@ -140,7 +141,7 @@
       $GRAB->update if $GRAB;
 
       check_hover $widget;
-      $TOOLTIP_WATCHER->cb->();
+      $TOOLTIP_WATCHER->invoke;
    }
 }
 
@@ -310,7 +311,7 @@
    undef $GRAB  if $GRAB  == $self;
    undef $HOVER if $HOVER == $self;
 
-   $CFPlus::UI::TOOLTIP_WATCHER->cb->()
+   $CFPlus::UI::TOOLTIP_WATCHER->invoke
       if $TOOLTIP->{owner} == $self;
 
    $self->emit ("focus_out");
@@ -339,8 +340,11 @@
 
    $self->set_invisible;
 
-   $self->{parent}->remove ($self)
-      if $self->{parent};
+   # extra $parent copy for 5.8.8+ bug workaround
+   # (otherwise $_[0] in remove gets freed
+   if (my $parent = $self->{parent}) {
+      $parent->remove ($self);
+   }
 }
 
 sub move_abs {
@@ -441,7 +445,7 @@
 
    if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
       delete $CFPlus::UI::TOOLTIP->{owner};
-      $CFPlus::UI::TOOLTIP_WATCHER->cb->();
+      $CFPlus::UI::TOOLTIP_WATCHER->invoke;
    }
 }
 
@@ -449,7 +453,7 @@
 sub coord2local {
    my ($self, $x, $y) = @_;
 
-   Carp::confess unless $self->{parent};#d#
+   return (undef, undef) unless $self->{parent};
 
    $self->{parent}->coord2local ($x  - $self->{x}, $y - $self->{y})
 }
@@ -458,7 +462,7 @@
 sub coord2global {
    my ($self, $x, $y) = @_;
 
-   Carp::confess unless $self->{parent};#d#
+   return (undef, undef) unless $self->{parent};
 
    $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
 }
@@ -3674,24 +3678,20 @@
    if ($self->{anim} && $self->{animspeed}) {
       CFPlus::weaken (my $widget = $self);
 
-      $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
-      $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
-      $self->{timer} = Event->timer (
-         parked   => 1,
-         cb       => sub {
-            return unless $::CONN;
-
-            my $w = $widget
-               or return;
-
-            ++$w->{frame};
-            $w->update_face;
-
-            # somehow, $widget can go away
-            $w->update;
-            $w->update_timer;
-         },
-      );
+      $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
+      $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
+         return unless $::CONN;
+
+         my $w = $widget
+            or return;
+
+         ++$w->{frame};
+         $w->update_face;
+
+         # somehow, $widget can go away
+         $w->update;
+         $w->update_timer;
+      };
 
       $self->update_face;
       $self->update_timer;
@@ -3706,11 +3706,6 @@
    return unless $self->{timer};
 
    if ($self->{visible}) {
-      $self->{timer}->at (
-         $self->{anim_start}
-         + $self->{animspeed}
-           * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
-      );
       $self->{timer}->start;
    } else {
       $self->{timer}->stop;
@@ -4133,7 +4128,7 @@
 
    $self->{value} = $item->[0];
    $self->set_markup ("$item->[1] ⇓");
-   $self->set_tooltip ($item->[2]);
+#   $self->set_tooltip ($item->[2]);
 }
 
 sub set_value {
@@ -4168,7 +4163,7 @@
 
    CFPlus::weaken (my $this = $self);
 
-   $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
+   $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
 
    $self
 }
@@ -4186,6 +4181,8 @@
       delete $self->{item}{$k} if $v->{timeout} < $NOW;
    }
 
+   $self->{timer}->set (1, 1);
+
    my @widgets;
 
    my @items = sort {
@@ -4193,8 +4190,6 @@
                      or $b->{id} <=> $a->{id}
                } values %{ $self->{item} };
 
-   $self->{timer}->interval (1);
-
    my $count = 10 + 1;
    for my $item (@items) {
       last unless --$count;
@@ -4227,7 +4222,7 @@
          $label->update;
          $label->set_max_size (undef, $label->{req_h} * $diff)
             if $diff < 1;
-         $self->{timer}->interval (1/30);
+         $self->{timer}->set (1/30, 1/30);
       } else {
          $label->{fg}[3] = $item->{fg}[3] || 1;
       }
@@ -4373,7 +4368,7 @@
 sub update {
    my ($self) = @_;
 
-   $::WANT_REFRESH->start;
+   $::WANT_REFRESH = 1;
 }
 
 sub add {