--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/24 06:05:35	1.162
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/24 06:40:29	1.163
@@ -41,11 +41,13 @@
 
 # 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 {
@@ -63,7 +65,10 @@
 
    $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 {
@@ -74,7 +79,10 @@
 
    $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;
@@ -100,7 +108,10 @@
       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
@@ -162,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 {
@@ -404,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 {
@@ -508,6 +519,7 @@
    my ($self, $child) = @_;
 
    delete $child->{parent};
+   $child->hide;
 
    $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
 
@@ -518,10 +530,13 @@
 sub clear {
    my ($self) = @_;
 
-   delete $_->{parent}
-      for @{ delete $self->{children} };
-
+   my $children = delete $self->{children};
    $self->{children} = [];
+
+   for (@$children) {
+      delete $_->{parent};
+      $_->hide;
+   }
 }
 
 sub find_widget {
@@ -899,7 +914,13 @@
 sub clear {
    my ($self) = @_;
 
-   delete $self->{children};
+   my $children = delete $self->{children};
+   
+   for (grep $_, map @$_, grep $_, @$children) {
+      delete $_->{parent};
+      $_->hide;
+   }
+
    $self->update;
 }