ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.163 by root, Mon Apr 24 06:40:29 2006 UTC

… …
39 delete $TOOLTIP->{owner}; 39 delete $TOOLTIP->{owner};
40} 40}
41 41
42# class methods for events 42# class methods for events
43sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
45} 46}
46 47
47sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
49} 51}
50 52
51sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
52 my ($ev) = @_; 54 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 63 check_tooltip;
62 } 64 }
63 65
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 67
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 68 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y);
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
67} 72}
68 73
69sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
70 my ($ev) = @_; 75 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
72 77
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 79
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 81
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 82 if ($GRAB) {
83 ($x, $y) = $GRAB->coord2local ($x, $y);
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
78 86
79 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 89 $grab->update if $grab;
82 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 107
100 check_tooltip; 108 check_tooltip;
101 } 109 }
102 110
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
104} 115}
105 116
106# convert position array to integers 117# convert position array to integers
107sub harmonize { 118sub harmonize {
108 my ($vals) = @_; 119 my ($vals) = @_;
… …
160} 171}
161 172
162sub hide { 173sub hide {
163 my ($self) = @_; 174 my ($self) = @_;
164 175
165 return unless $self->{parent}; 176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
166 178
167 $self->{parent}->remove ($self); 179 $self->{parent}->remove ($self)
180 if $self->{parent};
168} 181}
169 182
170sub move { 183sub move {
171 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
172 185
… …
402} 415}
403 416
404sub emit { 417sub emit {
405 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
406 419
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
408 $cb->($self, @args);
409 }
410} 421}
411 422
412sub DESTROY { 423sub DESTROY {
413 my ($self) = @_; 424 my ($self) = @_;
414 425
… …
506 517
507sub remove { 518sub remove {
508 my ($self, $child) = @_; 519 my ($self, $child) = @_;
509 520
510 delete $child->{parent}; 521 delete $child->{parent};
522 $child->hide;
511 523
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 524 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 525
514 $self->check_size; 526 $self->check_size;
515 $self->update; 527 $self->update;
516} 528}
517 529
518sub clear { 530sub clear {
519 my ($self) = @_; 531 my ($self) = @_;
520 532
521 delete $_->{parent} 533 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 534 $self->{children} = [];
535
536 for (@$children) {
537 delete $_->{parent};
538 $_->hide;
539 }
525} 540}
526 541
527sub find_widget { 542sub find_widget {
528 my ($self, $x, $y) = @_; 543 my ($self, $x, $y) = @_;
529 544
… …
897 912
898# TODO: move to container class maybe? send childs a signal on removal? 913# TODO: move to container class maybe? send childs a signal on removal?
899sub clear { 914sub clear {
900 my ($self) = @_; 915 my ($self) = @_;
901 916
902 delete $self->{children}; 917 my $children = delete $self->{children};
918
919 for (grep $_, map @$_, grep $_, @$children) {
920 delete $_->{parent};
921 $_->hide;
922 }
923
903 $self->update; 924 $self->update;
904} 925}
905 926
906sub get_wh { 927sub get_wh {
907 my ($self) = @_; 928 my ($self) = @_;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines