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.442 by root, Mon Oct 8 17:01:03 2007 UTC vs.
Revision 1.445 by root, Sat Dec 8 19:17:02 2007 UTC

… …
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use CFPlus;
10use CFPlus::Pod; 9use CFPlus::Pod;
11use CFPlus::Texture; 10use CFPlus::Texture;
12 11
… …
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 1/60, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
42 } 43 }
43 44
44 $TOOLTIP->hide; 45 $TOOLTIP->hide;
45 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
46 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
47}); 48};
48 49
49sub get_layout { 50sub get_layout {
50 my $layout; 51 my $layout;
51 52
52 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
87 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
88 89
89 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
90 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
91 92
92 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
93 } 94 }
94} 95}
95 96
96sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
97 my ($ev) = @_; 98 my ($ev) = @_;
… …
103 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
104 105
105 $GRAB = $widget; 106 $GRAB = $widget;
106 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
107 108
108 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
109 } 110 }
110 111
111 if ($GRAB) { 112 if ($GRAB) {
112 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
113 # mousewheel 114 # mousewheel
… …
138 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
139 $grab->update if $grab; 140 $grab->update if $grab;
140 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
141 142
142 check_hover $widget; 143 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
144 } 145 }
145} 146}
146 147
147sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
148 my ($ev) = @_; 149 my ($ev) = @_;
… …
308 delete $self->{root}; 309 delete $self->{root};
309 310
310 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
312 313
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $CFPlus::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
315 316
316 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
318} 319}
… …
439 440
440 $self->{tooltip} = $tooltip; 441 $self->{tooltip} = $tooltip;
441 442
442 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 443 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
443 delete $CFPlus::UI::TOOLTIP->{owner}; 444 delete $CFPlus::UI::TOOLTIP->{owner};
444 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 445 $CFPlus::UI::TOOLTIP_WATCHER->invoke;
445 } 446 }
446} 447}
447 448
448# translate global coordinates to local coordinate system 449# translate global coordinates to local coordinate system
449sub coord2local { 450sub coord2local {
… …
3673 3674
3674 if ($self->{anim} && $self->{animspeed}) { 3675 if ($self->{anim} && $self->{animspeed}) {
3675 CFPlus::weaken (my $widget = $self); 3676 CFPlus::weaken (my $widget = $self);
3676 3677
3677 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3678 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3678 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3679 $widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
3679 $self->{timer} = Event->timer ( 3680 $self->{timer} = EV::timer_ns 0, 0, sub {
3680 parked => 1,
3681 cb => sub {
3682 return unless $::CONN; 3681 return unless $::CONN;
3683 3682
3684 my $w = $widget 3683 my $w = $widget
3685 or return; 3684 or return;
3686 3685
3687 ++$w->{frame}; 3686 ++$w->{frame};
3688 $w->update_face; 3687 $w->update_face;
3689 3688
3690 # somehow, $widget can go away 3689 # somehow, $widget can go away
3691 $w->update; 3690 $w->update;
3692 $w->update_timer; 3691 $w->update_timer;
3693 },
3694 ); 3692 };
3695 3693
3696 $self->update_face; 3694 $self->update_face;
3697 $self->update_timer; 3695 $self->update_timer;
3698 } 3696 }
3699 3697
… …
3704 my ($self) = @_; 3702 my ($self) = @_;
3705 3703
3706 return unless $self->{timer}; 3704 return unless $self->{timer};
3707 3705
3708 if ($self->{visible}) { 3706 if ($self->{visible}) {
3709 $self->{timer}->at ( 3707 $self->{timer}->set (
3710 $self->{anim_start} 3708 $self->{anim_start}
3711 + $self->{animspeed} 3709 + $self->{animspeed}
3712 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed} 3710 * int 1.5 + (EV::now - $self->{anim_start}) / $self->{animspeed}
3713 ); 3711 );
3714 $self->{timer}->start; 3712 $self->{timer}->start;
3715 } else { 3713 } else {
3716 $self->{timer}->stop; 3714 $self->{timer}->stop;
3717 } 3715 }
… …
4166 @_, 4164 @_,
4167 ); 4165 );
4168 4166
4169 CFPlus::weaken (my $this = $self); 4167 CFPlus::weaken (my $this = $self);
4170 4168
4171 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4169 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4172 4170
4173 $self 4171 $self
4174} 4172}
4175 4173
4176sub reorder { 4174sub reorder {
… …
4184 4182
4185 while (my ($k, $v) = each %{ $self->{item} }) { 4183 while (my ($k, $v) = each %{ $self->{item} }) {
4186 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4184 delete $self->{item}{$k} if $v->{timeout} < $NOW;
4187 } 4185 }
4188 4186
4187 $self->{timer}->set (1, 1);
4188
4189 my @widgets; 4189 my @widgets;
4190 4190
4191 my @items = sort { 4191 my @items = sort {
4192 $a->{pri} <=> $b->{pri} 4192 $a->{pri} <=> $b->{pri}
4193 or $b->{id} <=> $a->{id} 4193 or $b->{id} <=> $a->{id}
4194 } values %{ $self->{item} }; 4194 } values %{ $self->{item} };
4195
4196 $self->{timer}->interval (1);
4197 4195
4198 my $count = 10 + 1; 4196 my $count = 10 + 1;
4199 for my $item (@items) { 4197 for my $item (@items) {
4200 last unless --$count; 4198 last unless --$count;
4201 4199
… …
4225 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4223 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4226 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4224 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4227 $label->update; 4225 $label->update;
4228 $label->set_max_size (undef, $label->{req_h} * $diff) 4226 $label->set_max_size (undef, $label->{req_h} * $diff)
4229 if $diff < 1; 4227 if $diff < 1;
4230 $self->{timer}->interval (1/30); 4228 $self->{timer}->set (1/30, 1/30);
4231 } else { 4229 } else {
4232 $label->{fg}[3] = $item->{fg}[3] || 1; 4230 $label->{fg}[3] = $item->{fg}[3] || 1;
4233 } 4231 }
4234 4232
4235 push @widgets, $label; 4233 push @widgets, $label;

Diff Legend

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