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.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.253 by root, Sun May 28 23:28:12 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
23 43
24 if ($TOOLTIP->{owner} != $widget) { 44 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide;
46
25 $TOOLTIP->{owner} = $widget; 47 $TOOLTIP->{owner} = $widget;
26 48
27 my $tip = $widget->{tooltip}; 49 my $tip = $widget->{tooltip};
28 50
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 51 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 52
31 $TOOLTIP->set_tooltip_from ($widget); 53 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 54 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 55 }
43 56
44 return; 57 return;
45 } 58 }
46 } 59 }
… …
155 for my $widget (values %WIDGET) { 168 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 169 if ($widget->{is_toplevel}) {
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 170 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 171 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 172 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 173 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 174 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 175 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
165 } 176 }
166 } 177 }
167 178
168 reconfigure_widgets; 179 reconfigure_widgets;
169} 180}
… …
186 can_events => 1, 197 can_events => 1,
187 @_ 198 @_
188 }, $class; 199 }, $class;
189 200
190 for (keys %$self) { 201 for (keys %$self) {
191 if (/^connect_(.*)$/) { 202 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 203 $self->connect ($1 => delete $self->{$_});
193 } 204 }
194 } 205 }
195 206
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197 208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH;
211 $self->{req_y} = $layout->{y} * $::HEIGHT;
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
214 }
215
198 $self 216 $self
199} 217}
200 218
201sub destroy { 219sub destroy {
202 my ($self) = @_; 220 my ($self) = @_;
… …
205 %$self = (); 223 %$self = ();
206} 224}
207 225
208sub show { 226sub show {
209 my ($self) = @_; 227 my ($self) = @_;
228
210 return if $self->{parent}; 229 return if $self->{parent};
211 230
212 $CFClient::UI::ROOT->add ($self); 231 $CFClient::UI::ROOT->add ($self);
213} 232}
214 233
215sub show_centered { 234sub center {
216 my ($self) = @_; 235 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220 236
221 $CFClient::UI::ROOT->on_post_alloc ( 237 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub { 238 "center_$self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 239 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
224 }, 240 },
225 ); 241 );
242
243 $self->update;
244}
245
246sub set_visible {
247 my ($self) = @_;
248
249 return if $self->{visible};
250
251 $self->{root} = $self->{parent}{root};
252 $self->{visible} = $self->{parent}{visible} + 1;
253
254 $self->emit (visibility_change => 1);
255
256 $self->realloc if !exists $self->{req_w};
257
258 $_->set_visible for $self->children;
226} 259}
227 260
228sub set_invisible { 261sub set_invisible {
229 my ($self) = @_; 262 my ($self) = @_;
230 263
231 # broken show/hide model 264 return unless $self->{visible};
232 265
266 $_->set_invisible for $self->children;
267
268 delete $self->{root};
233 delete $self->{visible}; 269 delete $self->{visible};
234 270
235 undef $GRAB if $GRAB == $self; 271 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 272 undef $HOVER if $HOVER == $self;
237 273
238 CFClient::UI::check_tooltip 274 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 275 if $TOOLTIP->{owner} == $self;
240 276
241 $self->focus_out; 277 $self->focus_out;
278
279 $self->emit (visibility_change => 0);
280}
281
282sub set_visibility {
283 my ($self, $visible) = @_;
284
285 return if $self->{visible} == $visible;
286
287 $visible ? $self->hide
288 : $self->show;
289}
290
291sub toggle_visibility {
292 my ($self) = @_;
293
294 $self->{visible}
295 ? $self->hide
296 : $self->show;
242} 297}
243 298
244sub hide { 299sub hide {
245 my ($self) = @_; 300 my ($self) = @_;
246 301
… …
261} 316}
262 317
263sub set_size { 318sub set_size {
264 my ($self, $w, $h) = @_; 319 my ($self, $w, $h) = @_;
265 320
266 $self->{user_w} = $w; 321 $self->{def_w} = $w;
267 $self->{user_h} = $h; 322 $self->{def_h} = $h;
268 323
269 $self->check_size; 324 $self->realloc;
270} 325}
271 326
272sub size_request { 327sub size_request {
273 require Carp; 328 require Carp;
274 Carp::confess "size_request is abstract"; 329 Carp::confess "size_request is abstract";
… …
294 $self->{y} = $y; 349 $self->{y} = $y;
295 $self->update; 350 $self->update;
296 } 351 }
297 352
298 if ($self->{w} != $w || $self->{h} != $h) { 353 if ($self->{w} != $w || $self->{h} != $h) {
354 return unless $self->{visible};
355
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
300 } 357 }
301} 358}
302 359
303sub size_allocate { 360sub size_allocate {
304 # nothing to be done 361 # nothing to be done
305}
306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312} 362}
313 363
314sub children { 364sub children {
315} 365}
316 366
… …
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
449
450sub find_widget {
451 my ($self, $x, $y) = @_;
452
453 return () unless $self->{can_events};
454
455 return $self
456 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
457 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
458
459 ()
460}
461
462sub set_parent {
463 my ($self, $parent) = @_;
464
465 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible};
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub _emit {
477 my ($self, $signal, @args) = @_;
478
479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
480}
481
482sub emit {
483 my ($self, $signal, @args) = @_;
484
485 $self->_emit ($signal, @args)
486 || $self->$signal (@args);
487}
488
489sub visibility_change {
490 #my ($self, $visible) = @_;
491}
492
493sub realloc {
494 my ($self) = @_;
495
496 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self};
498
499 $self->{root}{realloc}{$self} = $self;
500 $self->{root}->update;
501 } else {
502 delete $self->{req_w};
503 }
504}
505
506sub update {
507 my ($self) = @_;
508
509 $self->{parent}->update
510 if $self->{parent};
511}
399 512
400sub draw { 513sub draw {
401 my ($self) = @_; 514 my ($self) = @_;
402 515
403 return unless $self->{h} && $self->{w}; 516 return unless $self->{h} && $self->{w};
… …
441 my ($self) = @_; 554 my ($self) = @_;
442 555
443 warn "no draw defined for $self\n"; 556 warn "no draw defined for $self\n";
444} 557}
445 558
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub DESTROY { 559sub DESTROY {
504 my ($self) = @_; 560 my ($self) = @_;
505 561
506 delete $WIDGET{$self+0}; 562 delete $WIDGET{$self+0};
507 #$self->deactivate; 563 #$self->deactivate;
… …
602 $self->{children} = [ 658 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 659 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 660 @{$self->{children}}, @widgets
605 ]; 661 ];
606 662
607 $self->check_size (1); 663 $self->realloc;
608 $self->update;
609} 664}
610 665
611sub children { 666sub children {
612 @{ $_[0]{children} } 667 @{ $_[0]{children} }
613} 668}
… …
618 delete $child->{parent}; 673 delete $child->{parent};
619 $child->hide; 674 $child->hide;
620 675
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 676 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 677
623 $self->check_size; 678 $self->realloc;
624 $self->update;
625} 679}
626 680
627sub clear { 681sub clear {
628 my ($self) = @_; 682 my ($self) = @_;
629 683
… …
633 for (@$children) { 687 for (@$children) {
634 delete $_->{parent}; 688 delete $_->{parent};
635 $_->hide; 689 $_->hide;
636 } 690 }
637 691
638 $self->check_size; 692 $self->realloc;
639 $self->update;
640} 693}
641 694
642sub find_widget { 695sub find_widget {
643 my ($self, $x, $y) = @_; 696 my ($self, $x, $y) = @_;
644 697
… …
697sub size_request { 750sub size_request {
698 $_[0]{children}[0]->size_request 751 $_[0]{children}[0]->size_request
699} 752}
700 753
701sub size_allocate { 754sub size_allocate {
702 my ($self, $w, $h) = @_; 755 my ($self, $w, $h, $changed) = @_;
703 756
704 $self->{children}[0]->configure (0, 0, $w, $h); 757 $self->{children}[0]->configure (0, 0, $w, $h);
705} 758}
706 759
707############################################################################# 760#############################################################################
… …
724 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
725 $self->SUPER::update; 778 $self->SUPER::update;
726} 779}
727 780
728sub size_allocate { 781sub size_allocate {
729 my ($self, $w, $h) = @_; 782 my ($self, $w, $h, $changed) = @_;
730 783
731 $self->SUPER::size_allocate ($w, $h); 784 $self->SUPER::size_allocate ($w, $h, $changed);
732 $self->update; 785 $self->update
786 if $changed;
733} 787}
734 788
735sub _render { 789sub _render {
736 $_[0]{children}[0]->draw; 790 $_[0]{children}[0]->draw;
737} 791}
… …
781} 835}
782 836
783sub size_request { 837sub size_request {
784 my ($self) = @_; 838 my ($self) = @_;
785 839
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
787 841
788 @$self{qw(child_w child_h)} 842 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y};
844
845 ($w, $h)
789} 846}
790 847
791sub size_allocate { 848sub size_allocate {
792 my ($self, $w, $h) = @_; 849 my ($self, $w, $h, $changed) = @_;
793 850
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
796 853
797 $self->child->configure (0, 0, $w, $h); 854 $self->child->configure (0, 0, $w, $h);
… …
853 my $class = shift; 910 my $class = shift;
854 911
855 my $self; 912 my $self;
856 913
857 my $slider = new CFClient::UI::Slider 914 my $slider = new CFClient::UI::Slider
858 vertical => 1, 915 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 916 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 917 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 918 $self->{vp}->set_offset (0, $_[1]);
862 }, 919 },
863 ; 920 ;
864 921
865 $self = $class->SUPER::new ( 922 $self = $class->SUPER::new (
… …
873 $self->add ($self->{slider}); 930 $self->add ($self->{slider});
874 931
875 $self 932 $self
876} 933}
877 934
935sub update {
936 my ($self) = @_;
937
938 $self->SUPER::update;
939
940 # todo: overwrite size_allocate of child
941 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943}
944
878sub size_allocate { 945sub size_allocate {
879 my ($self, $w, $h) = @_; 946 my ($self, $w, $h, $changed) = @_;
880 947
881 $self->SUPER::size_allocate ($w, $h); 948 $self->SUPER::size_allocate ($w, $h, $changed);
882 949
883 my $child = $self->{vp}->child; 950 my $child = $self->{vp}->child;
884 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
885} 952}
886 953
… …
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1007 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1008
942sub new { 1009sub new {
943 my $class = shift; 1010 my $class = shift;
944
945 # TODO: user_x, user_y, overwrite moveto?
946 1011
947 my $self = $class->SUPER::new ( 1012 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1013 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1014 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1015 border => 0.6,
… …
976 $h + $self->border * 2, 1041 $h + $self->border * 2,
977 ) 1042 )
978} 1043}
979 1044
980sub size_allocate { 1045sub size_allocate {
981 my ($self, $w, $h) = @_; 1046 my ($self, $w, $h, $changed) = @_;
1047
1048 return unless $changed;
982 1049
983 $h -= List::Util::max 0, $self->border * 2; 1050 $h -= List::Util::max 0, $self->border * 2;
984 $w -= List::Util::max 0, $self->border * 2; 1051 $w -= List::Util::max 0, $self->border * 2;
985 1052
986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1053 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1010 my ($ev, $x, $y) = @_; 1077 my ($ev, $x, $y) = @_;
1011 1078
1012 my $dx = $ev->{x} - $ox; 1079 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1080 my $dy = $ev->{y} - $oy;
1014 1081
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1086 $self->move ($self->{user_x}, $self->{user_y});
1018 $self->check_size; 1087 $self->realloc;
1019 }; 1088 };
1020 1089
1021 } elsif ($lr ^ $td) { 1090 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1091 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1092 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1094 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1095 my ($ev, $x, $y) = @_;
1027 1096
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1097 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1098
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1099 $self->{user_x} = $bx + $x - $ox;
1100 $self->{user_y} = $by + $y - $oy;
1101
1102 $self->move ($self->{user_x}, $self->{user_y});
1031 $self->update; 1103 $self->realloc;
1032 }; 1104 };
1033 } 1105 }
1034} 1106}
1035 1107
1036sub button_up { 1108sub button_up {
… …
1101 col_expand => [], 1173 col_expand => [],
1102 @_, 1174 @_,
1103 ) 1175 )
1104} 1176}
1105 1177
1178sub children {
1179 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1180}
1181
1106sub add { 1182sub add {
1107 my ($self, $x, $y, $child) = @_; 1183 my ($self, $x, $y, $child) = @_;
1108 1184
1109 $child->set_parent ($self); 1185 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child; 1186 $self->{children}[$y][$x] = $child;
1111 1187
1112 $child->check_size; 1188 $self->realloc;
1113} 1189}
1114 1190
1115sub children {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117}
1118
1119# TODO: move to container class maybe? send childs a signal on removal? 1191# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1192sub clear {
1121 my ($self) = @_; 1193 my ($self) = @_;
1122 1194
1123 my @children = $self->children; 1195 my @children = $self->children;
1124 delete $self->{children}; 1196 delete $self->{children};
… …
1126 for (@children) { 1198 for (@children) {
1127 delete $_->{parent}; 1199 delete $_->{parent};
1128 $_->hide; 1200 $_->hide;
1129 } 1201 }
1130 1202
1131 $self->update; 1203 $self->realloc;
1132} 1204}
1133 1205
1134sub get_wh { 1206sub get_wh {
1135 my ($self) = @_; 1207 my ($self) = @_;
1136 1208
… …
1163 (sum @$hs), 1235 (sum @$hs),
1164 ) 1236 )
1165} 1237}
1166 1238
1167sub size_allocate { 1239sub size_allocate {
1168 my ($self, $w, $h) = @_; 1240 my ($self, $w, $h, $changed) = @_;
1169 1241
1170 my ($ws, $hs) = $self->get_wh; 1242 my ($ws, $hs) = $self->get_wh;
1171 1243
1172 my $req_w = sum @$ws; 1244 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1245 my $req_h = (sum @$hs) || 1;
1174 1246
1175 # TODO: nicer code && do row_expand 1247 # TODO: nicer code && do row_expand
1176 my @col_expand = @{$self->{col_expand}}; 1248 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1249 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1250 my $col_expand = (sum @col_expand) || 1;
… …
1232 } 1304 }
1233} 1305}
1234 1306
1235############################################################################# 1307#############################################################################
1236 1308
1309package CFClient::UI::Box;
1310
1311our @ISA = CFClient::UI::Container::;
1312
1313sub size_request {
1314 my ($self) = @_;
1315
1316 $self->{vertical}
1317 ? (
1318 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1319 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1320 )
1321 : (
1322 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 )
1325}
1326
1327sub size_allocate {
1328 my ($self, $w, $h, $changed) = @_;
1329
1330 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children};
1332
1333 my @req;
1334
1335 if ($self->{homogeneous}) {
1336 @req = ($space / (@$children || 1)) x @$children;
1337 } else {
1338 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1339 my $req = List::Util::sum @req;
1340
1341 if ($req > $space) {
1342 # ah well, not enough space
1343 $_ *= $space / $req for @req;
1344 } else {
1345 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1346
1347 $space = ($space - $req) / $expand; # remaining space to give away
1348
1349 $req[$_] += $space * $children->[$_]{expand}
1350 for 0 .. $#$children;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@req;
1355
1356 my $pos = 0;
1357 for (0 .. $#$children) {
1358 my $alloc = $req[$_];
1359 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1360
1361 $pos += $alloc;
1362 }
1363
1364 1
1365}
1366
1367#############################################################################
1368
1237package CFClient::UI::HBox; 1369package CFClient::UI::HBox;
1238 1370
1239# TODO: wrap into common Box base class
1240
1241our @ISA = CFClient::UI::Container::; 1371our @ISA = CFClient::UI::Box::;
1242 1372
1243sub size_request { 1373sub new {
1244 my ($self) = @_; 1374 my $class = shift;
1245 1375
1246 my @alloc = map [$_->size_request], @{$self->{children}}; 1376 $class->SUPER::new (
1247 1377 vertical => 0,
1248 ( 1378 @_,
1249 (List::Util::sum map $_->[0], @alloc),
1250 (List::Util::max map $_->[1], @alloc),
1251 ) 1379 )
1252} 1380}
1253 1381
1254sub size_allocate {
1255 my ($self, $w, $h) = @_;
1256
1257 ($h, $w) = ($w, $h);
1258
1259 my $children = $self->{children};
1260
1261 my @h = map $_->{req_w}, @$children;
1262
1263 my $req_h = List::Util::sum @h;
1264
1265 if ($req_h > $h) {
1266 # ah well, not enough space
1267 $_ *= $h / $req_h for @h;
1268 } else {
1269 my $exp = List::Util::sum map $_->{expand}, @$children;
1270 $exp ||= 1;
1271
1272 for (0 .. $#$children) {
1273 my $child = $children->[$_];
1274
1275 my $alloc_h = $h[$_];
1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277 $h[$_] = $alloc_h;
1278 }
1279 }
1280
1281 CFClient::UI::harmonize \@h;
1282
1283 my $y = 0;
1284 for (0 .. $#$children) {
1285 my $child = $children->[$_];
1286 my $h = $h[$_];
1287 $child->configure ($y, 0, $h, $w);
1288
1289 $y += $h;
1290 }
1291
1292 1
1293}
1294
1295############################################################################# 1382#############################################################################
1296 1383
1297package CFClient::UI::VBox; 1384package CFClient::UI::VBox;
1298 1385
1299# TODO: wrap into common Box base class
1300
1301our @ISA = CFClient::UI::Container::; 1386our @ISA = CFClient::UI::Box::;
1302 1387
1303sub size_request { 1388sub new {
1304 my ($self) = @_; 1389 my $class = shift;
1305 1390
1306 my @alloc = map [$_->size_request], @{$self->{children}}; 1391 $class->SUPER::new (
1307 1392 vertical => 1,
1308 ( 1393 @_,
1309 (List::Util::max map $_->[0], @alloc),
1310 (List::Util::sum map $_->[1], @alloc),
1311 ) 1394 )
1312}
1313
1314sub size_allocate {
1315 my ($self, $w, $h) = @_;
1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319 my $children = $self->{children};
1320
1321 my @h = map $_->{req_h}, @$children;
1322
1323 my $req_h = List::Util::sum @h;
1324
1325 if ($req_h > $h) {
1326 # ah well, not enough space
1327 $_ *= $h / $req_h for @h;
1328 } else {
1329 my $exp = List::Util::sum map $_->{expand}, @$children;
1330 $exp ||= 1;
1331
1332 for (0 .. $#$children) {
1333 my $child = $children->[$_];
1334
1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336 }
1337 }
1338
1339 CFClient::UI::harmonize \@h;
1340
1341 my $y = 0;
1342 for (0 .. $#$children) {
1343 my $child = $children->[$_];
1344 my $h = $h[$_];
1345 $child->configure (0, $y, $w, $h);
1346
1347 $y += $h;
1348 }
1349
1350 1
1351} 1395}
1352 1396
1353############################################################################# 1397#############################################################################
1354 1398
1355package CFClient::UI::Label; 1399package CFClient::UI::Label;
… …
1418 $self->{text} = "T$text"; 1462 $self->{text} = "T$text";
1419 1463
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421 $self->{layout}->set_text ($text); 1465 $self->{layout}->set_text ($text);
1422 1466
1467 $self->realloc;
1423 $self->update; 1468 $self->update;
1424 $self->check_size;
1425} 1469}
1426 1470
1427sub set_markup { 1471sub set_markup {
1428 my ($self, $markup) = @_; 1472 my ($self, $markup) = @_;
1429 1473
… …
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1477 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434 1478
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1479 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436 $self->{layout}->set_markup ($markup); 1480 $self->{layout}->set_markup ($markup);
1437 1481
1482 $self->realloc;
1438 $self->update; 1483 $self->update;
1439 $self->check_size;
1440} 1484}
1441 1485
1442sub size_request { 1486sub size_request {
1443 my ($self) = @_; 1487 my ($self) = @_;
1444 1488
… …
1465 $h + $self->{padding} * 2, 1509 $h + $self->{padding} * 2,
1466 ) 1510 )
1467} 1511}
1468 1512
1469sub size_allocate { 1513sub size_allocate {
1470 my ($self, $w, $h) = @_; 1514 my ($self, $w, $h, $changed) = @_;
1471 1515
1472 delete $self->{texture}; 1516 delete $self->{texture}
1517 if $changed;
1473} 1518}
1474 1519
1475sub set_fontsize { 1520sub set_fontsize {
1476 my ($self, $fontsize) = @_; 1521 my ($self, $fontsize) = @_;
1477 1522
1478 $self->{fontsize} = $fontsize; 1523 $self->{fontsize} = $fontsize;
1479 delete $self->{texture}; 1524 delete $self->{texture};
1480 1525
1481 $self->update; 1526 $self->realloc;
1482 $self->check_size;
1483} 1527}
1484 1528
1485sub _draw { 1529sub _draw {
1486 my ($self) = @_; 1530 my ($self) = @_;
1487 1531
… …
1567sub set_text { 1611sub set_text {
1568 my ($self, $text) = @_; 1612 my ($self, $text) = @_;
1569 1613
1570 $self->{cursor} = length $text; 1614 $self->{cursor} = length $text;
1571 $self->_set_text ($text); 1615 $self->_set_text ($text);
1572 $self->update; 1616
1573 $self->check_size; 1617 $self->realloc;
1574} 1618}
1575 1619
1576sub get_text { 1620sub get_text {
1577 $_[0]{text} 1621 $_[0]{text}
1578} 1622}
… …
1611 } elsif ($uni) { 1655 } elsif ($uni) {
1612 substr $text, $self->{cursor}++, 0, chr $uni; 1656 substr $text, $self->{cursor}++, 0, chr $uni;
1613 } 1657 }
1614 1658
1615 $self->_set_text ($text); 1659 $self->_set_text ($text);
1616 $self->update; 1660
1617 $self->check_size; 1661 $self->realloc;
1618} 1662}
1619 1663
1620sub focus_in { 1664sub focus_in {
1621 my ($self) = @_; 1665 my ($self) = @_;
1622 1666
… …
2129 $self->update; 2173 $self->update;
2130 2174
2131 $self 2175 $self
2132} 2176}
2133 2177
2178sub changed { }
2179
2134sub set_range { 2180sub set_range {
2135 my ($self, $range) = @_; 2181 my ($self, $range) = @_;
2136 2182
2137 $self->{range} = $range; 2183 ($range, $self->{range}) = ($self->{range}, $range);
2138 2184
2139 $self->update; 2185 $self->update
2186 if "@$range" ne "@{$self->{range}}";
2140} 2187}
2141 2188
2142sub set_value { 2189sub set_value {
2143 my ($self, $value) = @_; 2190 my ($self, $value) = @_;
2144 2191
… …
2326 $self->{fontsize} = $fontsize; 2373 $self->{fontsize} = $fontsize;
2327 $self->reflow; 2374 $self->reflow;
2328} 2375}
2329 2376
2330sub size_allocate { 2377sub size_allocate {
2331 my ($self, $w, $h) = @_; 2378 my ($self, $w, $h, $changed) = @_;
2332 2379
2333 $self->SUPER::size_allocate ($w, $h); 2380 $self->SUPER::size_allocate ($w, $h, $changed);
2381
2382 return unless $changed;
2334 2383
2335 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2384 $self->{layout}->set_font ($self->{font}) if $self->{font};
2336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2337 $self->{layout}->set_width ($self->{children}[0]{w}); 2386 $self->{layout}->set_width ($self->{children}[0]{w});
2338 2387
… …
2527 2576
2528sub new { 2577sub new {
2529 my $class = shift; 2578 my $class = shift;
2530 2579
2531 my $self = $class->SUPER::new ( 2580 my $self = $class->SUPER::new (
2532 state => 0, 2581 state => 0,
2533 connect_activate => \&toggle_flopper, 2582 on_activate => \&toggle_flopper,
2534 @_ 2583 @_
2535 ); 2584 );
2536 2585
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 2586 $self
2543} 2587}
2544 2588
2545sub toggle_flopper { 2589sub toggle_flopper {
2546 my ($self) = @_; 2590 my ($self) = @_;
2547 2591
2548 # TODO: use animation 2592 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 2593}
2560 2594
2561############################################################################# 2595#############################################################################
2562 2596
2563package CFClient::UI::Tooltip; 2597package CFClient::UI::Tooltip;
… …
2595 2629
2596 ($w + 4, $h + 4) 2630 ($w + 4, $h + 4)
2597} 2631}
2598 2632
2599sub size_allocate { 2633sub size_allocate {
2600 my ($self, $w, $h) = @_; 2634 my ($self, $w, $h, $changed) = @_;
2601 2635
2636 return unless $changed;
2637
2602 $self->SUPER::size_allocate ($w - 4, $h - 4); 2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2639}
2640
2641sub visibility_change {
2642 my ($self, $visible) = @_;
2643
2644 return unless $visible;
2645
2646 $self->{root}->on_post_alloc ("move_$self" => sub {
2647 my $widget = $self->{owner};
2648
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH;
2653
2654 $self->move ($x, $y);
2655 });
2603} 2656}
2604 2657
2605sub _draw { 2658sub _draw {
2606 my ($self) = @_; 2659 my ($self) = @_;
2607 2660
… …
2624 glVertex $w, $h; 2677 glVertex $w, $h;
2625 glVertex $w, 0; 2678 glVertex $w, 0;
2626 glEnd; 2679 glEnd;
2627 2680
2628 glTranslate 2 - 0.375, 2 - 0.375; 2681 glTranslate 2 - 0.375, 2 - 0.375;
2682
2629 $self->SUPER::_draw; 2683 $self->SUPER::_draw;
2630} 2684}
2631 2685
2632############################################################################# 2686#############################################################################
2633 2687
… …
2709 $self->SUPER::DESTROY; 2763 $self->SUPER::DESTROY;
2710} 2764}
2711 2765
2712############################################################################# 2766#############################################################################
2713 2767
2714package CFClient::UI::InventoryItem;
2715
2716our @ISA = CFClient::UI::HBox::;
2717
2718sub new {
2719 my $class = shift;
2720
2721 my %args = @_;
2722
2723 my $item = delete $args{item};
2724
2725 my $desc = CFClient::Item::desc_string $item;
2726
2727 my $self = $class->SUPER::new (
2728 can_hover => 1,
2729 can_events => 1,
2730 tooltip => ((CFClient::UI::Label::escape $desc)
2731 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2732 connect_button_down => sub {
2733 my ($self, $ev, $x, $y) = @_;
2734
2735 # todo: maybe put examine on 1? but should just be a tooltip :(
2736 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737 my $targ = $::CONN->{player}{tag};
2738
2739 if ($item->{container} == $::CONN->{player}{tag}) {
2740 $targ = $main::OPENCONT;
2741 }
2742
2743 $::CONN->send ("move $targ $item->{tag} 0");
2744 } elsif ($ev->{button} == 1) {
2745 $::CONN->send ("examine $item->{tag}");
2746 } elsif ($ev->{button} == 2) {
2747 $::CONN->send ("apply $item->{tag}");
2748 } elsif ($ev->{button} == 3) {
2749 my @menu_items = (
2750 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2751 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2752 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753 (
2754 $item->{flags} & Crossfire::Protocol::F_LOCKED
2755 ? (
2756 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757 )
2758 : (
2759 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2760 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761 )
2762 ),
2763 );
2764
2765 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2766 }
2767
2768 1
2769 },
2770 %args
2771 );
2772
2773
2774 $self->add (new CFClient::UI::Face
2775 can_events => 0,
2776 face => $item->{face},
2777 anim => $item->{anim},
2778 animspeed => $item->{animspeed},
2779 );
2780
2781 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783 $self->{item} = $item;
2784
2785 $self->update_item;
2786
2787 $self
2788}
2789
2790sub update_item {
2791 my ($self) = @_;
2792
2793 my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795 $self->{name_lbl}->set_text ($desc);
2796}
2797
2798#############################################################################
2799
2800package CFClient::UI::Inventory; 2768package CFClient::UI::Inventory;
2801 2769
2802our @ISA = CFClient::UI::ScrolledWindow::; 2770our @ISA = CFClient::UI::ScrolledWindow::;
2803 2771
2804sub new { 2772sub new {
… …
2833 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2834 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2802 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2835 2803
2836 $row++; 2804 $row++;
2837 } 2805 }
2838
2839# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2840}
2841
2842sub size_request {
2843 my ($self) = @_;
2844 ($self->{req_w}, $self->{req_h});
2845} 2806}
2846 2807
2847############################################################################# 2808#############################################################################
2848 2809
2849package CFClient::UI::Menu; 2810package CFClient::UI::Menu;
… …
3035use CFClient::OpenGL; 2996use CFClient::OpenGL;
3036 2997
3037sub new { 2998sub new {
3038 my $class = shift; 2999 my $class = shift;
3039 3000
3040 $class->SUPER::new ( 3001 my $self = $class->SUPER::new (
3002 visible => 1,
3041 @_, 3003 @_,
3042 ) 3004 );
3005
3006 Scalar::Util::weaken ($self->{root} = $self);
3007
3008 $self
3043} 3009}
3044 3010
3045sub configure { 3011sub configure {
3046 my ($self, $x, $y, $w, $h) = @_; 3012 my ($self, $x, $y, $w, $h) = @_;
3047 3013
3048 $self->{w} = $w; 3014 $self->{w} = $w;
3049 $self->{h} = $h; 3015 $self->{h} = $h;
3050} 3016}
3051 3017
3052sub check_size { 3018sub reconfigure {
3053 my ($self) = @_; 3019 my ($self) = @_;
3054 3020
3021 $self->SUPER::reconfigure;
3022
3055 $self->size_allocate ($self->{w}, $self->{h}) 3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
3056 if $self->{w}; 3024 if $self->{w};
3057} 3025}
3058 3026
3059sub size_request { 3027sub size_request {
3060 my ($self) = @_; 3028 my ($self) = @_;
3061 3029
3062 ($self->{w}, $self->{h}) 3030 ($self->{w}, $self->{h})
3063} 3031}
3064 3032
3065sub size_allocate { 3033sub size_allocate {
3066 my ($self, $w, $h) = @_; 3034 my ($self, $w, $h, $changed) = @_;
3067 3035
3068 for my $child ($self->children) { 3036 for my $child ($self->children) {
3069 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3070 3038
3071 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3072 if exists $child->{req_x}; 3040 if exists $child->{req_x};
3073 3041
3074 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3075 if exists $child->{req_y}; 3043 if exists $child->{req_y};
3076 3044
3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
3077 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3047 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3078 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3048 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079 3049
3080 $child->configure ($X, $Y, $W, $H); 3050 $child->configure ($X, $Y, $W, $H);
3081 } 3051 }
… …
3094} 3064}
3095 3065
3096sub update { 3066sub update {
3097 my ($self) = @_; 3067 my ($self) = @_;
3098 3068
3099 $self->check_size;
3100 $::WANT_REFRESH++; 3069 $::WANT_REFRESH++;
3101} 3070}
3102 3071
3103sub add { 3072sub add {
3104 my ($self, @children) = @_; 3073 my ($self, @children) = @_;
3105
3106 for (my @widgets = @children; my $w = pop @widgets; ) {
3107 push @widgets, $w->children;
3108 $w->{root} = $self;
3109 $w->{visible} = 1;
3110 }
3111 3074
3112 for my $child (@children) { 3075 for my $child (@children) {
3113 $child->{is_toplevel} = 1; 3076 $child->{is_toplevel} = 1;
3114 3077
3115 # integerise window positions 3078 # integerise window positions
… …
3150 while ($self->{refresh_hook}) { 3113 while ($self->{refresh_hook}) {
3151 $_->() 3114 $_->()
3152 for values %{delete $self->{refresh_hook}}; 3115 for values %{delete $self->{refresh_hook}};
3153 } 3116 }
3154 3117
3155 if ($self->{check_size}) { 3118 if ($self->{realloc}) {
3156 my @queue = ([], []); 3119 my @queue;
3157 3120
3158 for (;;) { 3121 while () {
3159 if ($self->{check_size}) { 3122 if ($self->{realloc}) {
3160 # heuristic: check containers last 3123 #TODO use array-of-depth approach
3161 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3124
3162 for values %{delete $self->{check_size}} 3125 @queue = sort { $a->{visible} <=> $b->{visible} }
3126 @queue, values %{delete $self->{realloc}};
3163 } 3127 }
3164 3128
3165 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3129 my $widget = pop @queue || last;
3166 3130
3131 $widget->{visible} or last; # do not resize invisible widgets
3132
3167 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3168 ? @$widget{qw(user_w user_h)} 3134 ? @$widget{qw(def_w def_h)}
3169 : $widget->size_request; 3135 : $widget->size_request;
3170 3136
3171 if (delete $widget->{force_alloc}
3172 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3173 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3137 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3174 3138
3175 $widget->{req_w} = $w; 3139 $widget->{req_w} = $w;
3176 $widget->{req_h} = $h; 3140 $widget->{req_h} = $h;
3177 3141
3178 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3179 3143
3180 $widget->{parent}->check_size 3144 push @queue, $widget->{parent}
3181 if $widget->{parent}; 3145 if $widget->{parent};
3182 }
3183 } 3146 }
3184 } 3147 }
3185 3148
3186 while ($self->{size_alloc}) { 3149 while (my $size_alloc = delete $self->{size_alloc}) {
3187 for (values %{delete $self->{size_alloc}}) { 3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3188 my ($widget, $w, $h) = @$_; 3151 values %$size_alloc;
3152
3153 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last };
3189 3155
3190 $w = 0 if $w < 0; 3156 $w = 0 if $w < 0;
3191 $h = 0 if $h < 0; 3157 $h = 0 if $h < 0;
3192 3158
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3160
3193 $widget->{w} = $w; 3161 $widget->{w} = $w;
3194 $widget->{h} = $h; 3162 $widget->{h} = $h;
3163
3195 $widget->emit (size_allocate => $w, $h); 3164 $widget->emit (size_allocate => $w, $h, $changed);
3196 } 3165 }
3197 } 3166 }
3198 3167
3199 while ($self->{post_alloc_hook}) { 3168 while ($self->{post_alloc_hook}) {
3200 $_->() 3169 $_->()

Diff Legend

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