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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.245 by elmex, Sat May 27 21:15:57 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}) {
… …
186 can_events => 1, 206 can_events => 1,
187 @_ 207 @_
188 }, $class; 208 }, $class;
189 209
190 for (keys %$self) { 210 for (keys %$self) {
191 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
193 } 213 }
194 } 214 }
195 215
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197 217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
224
198 $self 225 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
199} 236}
200 237
201sub destroy { 238sub destroy {
202 my ($self) = @_; 239 my ($self) = @_;
203 240
… …
226} 263}
227 264
228sub set_invisible { 265sub set_invisible {
229 my ($self) = @_; 266 my ($self) = @_;
230 267
268 return unless $self->{visible};
269
231 # broken show/hide model 270 # broken show/hide model
232 271
272 delete $self->{root};
233 delete $self->{visible}; 273 delete $self->{visible};
234 274
235 undef $GRAB if $GRAB == $self; 275 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 276 undef $HOVER if $HOVER == $self;
237 277
238 CFClient::UI::check_tooltip 278 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 279 if $CFClient::UI::TOOLTIP->{owner} == $self;
240 280
241 $self->focus_out; 281 $self->focus_out;
282
283 $self->emit (visibility_change => 0);
242} 284}
243 285
244sub hide { 286sub hide {
245 my ($self) = @_; 287 my ($self) = @_;
246 288
… …
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 363 delete $self->{max_h}; $self->{max_h} = $h if $h;
322} 364}
323 365
324sub set_tooltip { 366sub set_tooltip {
325 my ($self, $tooltip) = @_; 367 my ($self, $tooltip) = @_;
368
369 $tooltip =~ s/^\s+//;
370 $tooltip =~ s/\s+$//;
371
372 return if $self->{tooltip} eq $tooltip;
326 373
327 $self->{tooltip} = $tooltip; 374 $self->{tooltip} = $tooltip;
328 375
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 376 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner}; 377 delete $CFClient::UI::TOOLTIP->{owner};
… …
420 if ($ENV{PCLIENT_DEBUG}) { 467 if ($ENV{PCLIENT_DEBUG}) {
421 glPushMatrix; 468 glPushMatrix;
422 glColor 1, 1, 0, 1; 469 glColor 1, 1, 0, 1;
423 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424 glBegin GL_LINE_LOOP; 471 glBegin GL_LINE_LOOP;
425 glVertex 0 , 0; 472 glVertex 0 , 0;
426 glVertex $self->{w}, 0; 473 glVertex $self->{w} - 1, 0;
427 glVertex $self->{w}, $self->{h}; 474 glVertex $self->{w} - 1, $self->{h} - 1;
428 glVertex 0 , $self->{h}; 475 glVertex 0 , $self->{h} - 1;
429 glEnd; 476 glEnd;
430 glPopMatrix; 477 glPopMatrix;
431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 478 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
432 } 479 }
433} 480}
… …
453sub set_parent { 500sub set_parent {
454 my ($self, $parent) = @_; 501 my ($self, $parent) = @_;
455 502
456 Scalar::Util::weaken ($self->{parent} = $parent); 503 Scalar::Util::weaken ($self->{parent} = $parent);
457 504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
458 # TODO: req_w _does_change after ->reconfigure 513 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size 514 $self->check_size
460 unless exists $self->{req_w}; 515 unless exists $self->{req_w};
461 516
462 $self->show; 517 $self->show;
… …
491sub emit { 546sub emit {
492 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
493 548
494 $self->_emit ($signal, @args) 549 $self->_emit ($signal, @args)
495 || $self->$signal (@args); 550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
496} 555}
497 556
498sub DESTROY { 557sub DESTROY {
499 my ($self) = @_; 558 my ($self) = @_;
500 559
… …
613 delete $child->{parent}; 672 delete $child->{parent};
614 $child->hide; 673 $child->hide;
615 674
616 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617 676
618 $self->check_size; 677 $self->check_size (1);
619 $self->update; 678 $self->update;
620} 679}
621 680
622sub clear { 681sub clear {
623 my ($self) = @_; 682 my ($self) = @_;
… …
763 822
764package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
765 824
766our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
767 826
827sub new {
828 my $class = shift;
829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
768sub size_request { 837sub size_request {
769 my ($self) = @_; 838 my ($self) = @_;
770 839
771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
772 841
… …
774} 843}
775 844
776sub size_allocate { 845sub size_allocate {
777 my ($self, $w, $h) = @_; 846 my ($self, $w, $h) = @_;
778 847
779 my ($cw, $ch) = @$self{qw(child_w child_h)}; 848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
780# $w = $self->{w}; 849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850
781 $self->child->configure (0, 0, $cw, $ch); 851 $self->child->configure (0, 0, $w, $h);
782 $self->update; 852 $self->update;
783} 853}
784 854
785sub set_offset { 855sub set_offset {
786 my ($self, $x, $y) = @_; 856 my ($self, $x, $y) = @_;
… …
837 my $class = shift; 907 my $class = shift;
838 908
839 my $self; 909 my $self;
840 910
841 my $slider = new CFClient::UI::Slider 911 my $slider = new CFClient::UI::Slider
842 vertical => 1, 912 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix 913 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub { 914 on_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]); 915 $self->{vp}->set_offset (0, $_[1]);
846 }, 916 },
847 ; 917 ;
848 918
849 $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
… …
855 $self->{vp}->add ($self->{scrolled}); 925 $self->{vp}->add ($self->{scrolled});
856 $self->add ($self->{vp}); 926 $self->add ($self->{vp});
857 $self->add ($self->{slider}); 927 $self->add ($self->{slider});
858 928
859 $self 929 $self
930}
931
932sub update {
933 my ($self) = @_;
934
935 $self->SUPER::update;
936
937 # todo: overwrite size_allocate of child
938 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
860} 940}
861 941
862sub size_allocate { 942sub size_allocate {
863 my ($self, $w, $h) = @_; 943 my ($self, $w, $h) = @_;
864 944
… …
994 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
995 1075
996 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
998 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
1002 $self->check_size; 1084 $self->check_size;
1003 }; 1085 };
1004 1086
1005 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
1006 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1009 $self->{motion} = sub { 1091 $self->{motion} = sub {
1010 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
1011 1093
1012 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
1013 1095
1014 $self->move ($bx + $x - $ox, $by + $y - $oy); 1096 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy;
1098 $self->move ($self->{user_x}, $self->{user_y});
1015 $self->update; 1099 $self->update;
1016 }; 1100 };
1017 } 1101 }
1018} 1102}
1019 1103
… …
1081sub new { 1165sub new {
1082 my $class = shift; 1166 my $class = shift;
1083 1167
1084 $class->SUPER::new ( 1168 $class->SUPER::new (
1085 col_expand => [], 1169 col_expand => [],
1086 @_ 1170 @_,
1087 ) 1171 )
1172}
1173
1174sub children {
1175 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1176}
1089 1177
1090sub add { 1178sub add {
1091 my ($self, $x, $y, $child) = @_; 1179 my ($self, $x, $y, $child) = @_;
1092 1180
1093 $child->set_parent ($self); 1181 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1182 $self->{children}[$y][$x] = $child;
1095 1183
1096 $child->check_size; 1184 $self->check_size (1);
1097} 1185}
1098 1186
1099sub children {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101}
1102
1103# TODO: move to container class maybe? send childs a signal on removal? 1187# TODO: move to container class maybe? send children a signal on removal?
1104sub clear { 1188sub clear {
1105 my ($self) = @_; 1189 my ($self) = @_;
1106 1190
1107 my @children = $self->children; 1191 my @children = $self->children;
1108 delete $self->{children}; 1192 delete $self->{children};
… …
1110 for (@children) { 1194 for (@children) {
1111 delete $_->{parent}; 1195 delete $_->{parent};
1112 $_->hide; 1196 $_->hide;
1113 } 1197 }
1114 1198
1199 $self->check_size (1);
1115 $self->update; 1200 $self->update;
1116} 1201}
1117 1202
1118sub get_wh { 1203sub get_wh {
1119 my ($self) = @_; 1204 my ($self) = @_;
… …
1151sub size_allocate { 1236sub size_allocate {
1152 my ($self, $w, $h) = @_; 1237 my ($self, $w, $h) = @_;
1153 1238
1154 my ($ws, $hs) = $self->get_wh; 1239 my ($ws, $hs) = $self->get_wh;
1155 1240
1156 my $req_w = sum @$ws; 1241 my $req_w = (sum @$ws) || 1;
1157 my $req_h = sum @$hs; 1242 my $req_h = (sum @$hs) || 1;
1158 1243
1159 # TODO: nicer code && do row_expand 1244 # TODO: nicer code && do row_expand
1160 my @col_expand = @{$self->{col_expand}}; 1245 my @col_expand = @{$self->{col_expand}};
1161 @col_expand = (1) x @$ws unless @col_expand; 1246 @col_expand = (1) x @$ws unless @col_expand;
1162 my $col_expand = (sum @col_expand) || 1; 1247 my $col_expand = (sum @col_expand) || 1;
… …
2116} 2201}
2117 2202
2118sub set_range { 2203sub set_range {
2119 my ($self, $range) = @_; 2204 my ($self, $range) = @_;
2120 2205
2121 $self->{range} = $range; 2206 ($range, $self->{range}) = ($self->{range}, $range);
2122 2207
2123 $self->update; 2208 $self->update
2209 if "@$range" ne "@{$self->{range}}";
2124} 2210}
2125 2211
2126sub set_value { 2212sub set_value {
2127 my ($self, $value) = @_; 2213 my ($self, $value) = @_;
2128 2214
… …
2511 2597
2512sub new { 2598sub new {
2513 my $class = shift; 2599 my $class = shift;
2514 2600
2515 my $self = $class->SUPER::new ( 2601 my $self = $class->SUPER::new (
2516 state => 0, 2602 state => 0,
2517 connect_activate => \&toggle_flopper, 2603 on_activate => \&toggle_flopper,
2518 @_ 2604 @_
2519 ); 2605 );
2520 2606
2521 if ($self->{state}) {
2522 $self->{state} = 0;
2523 $self->toggle_flopper;
2524 }
2525
2526 $self 2607 $self
2527} 2608}
2528 2609
2529sub toggle_flopper { 2610sub toggle_flopper {
2530 my ($self) = @_; 2611 my ($self) = @_;
2531 2612
2532 # TODO: use animation 2613 $self->{other}->toggle_visibility;
2533 if ($self->{state} = !$self->{state}) {
2534 $CFClient::UI::ROOT->add ($self->{other});
2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2536 $self->_emit ("open");
2537 } else {
2538 $CFClient::UI::ROOT->remove ($self->{other});
2539 $self->_emit ("close");
2540 }
2541
2542 $self->_emit (changed => $self->{state});
2543} 2614}
2544 2615
2545############################################################################# 2616#############################################################################
2546 2617
2547package CFClient::UI::Tooltip; 2618package CFClient::UI::Tooltip;
… …
2623 2694
2624sub new { 2695sub new {
2625 my $class = shift; 2696 my $class = shift;
2626 2697
2627 my $self = $class->SUPER::new ( 2698 my $self = $class->SUPER::new (
2628 aspect => 1, 2699 aspect => 1,
2700 can_events => 0,
2629 @_, 2701 @_,
2630 ); 2702 );
2631 2703
2632 if ($self->{anim} && $self->{animspeed}) { 2704 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2705 Scalar::Util::weaken (my $widget = $self);
… …
2692 $self->SUPER::DESTROY; 2764 $self->SUPER::DESTROY;
2693} 2765}
2694 2766
2695############################################################################# 2767#############################################################################
2696 2768
2697package CFClient::UI::InventoryItem; 2769package CFClient::UI::Inventory;
2698 2770
2699our @ISA = CFClient::UI::HBox::; 2771our @ISA = CFClient::UI::ScrolledWindow::;
2700
2701sub _item_to_desc {
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2726 2772
2727sub new { 2773sub new {
2728 my $class = shift; 2774 my $class = shift;
2729 2775
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2736 my $self = $class->SUPER::new ( 2776 my $self = $class->SUPER::new (
2737 can_hover => 1,
2738 can_events => 1,
2739 tooltip => ((CFClient::UI::Label::escape $desc)
2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741 connect_button_down => sub {
2742 my ($self, $ev, $x, $y) = @_;
2743
2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2755 } elsif ($ev->{button} == 2) {
2756 $::CONN->send ("apply $item->{tag}");
2757 } elsif ($ev->{button} == 3) {
2758 my @menu_items = (
2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2771 ),
2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775 }
2776
2777 1
2778 },
2779 %args
2780 );
2781
2782
2783 $self->add (new CFClient::UI::Face
2784 can_events => 0,
2785 face => $item->{face},
2786 anim => $item->{anim},
2787 animspeed => $item->{animspeed},
2788 );
2789
2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2795
2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Inventory;
2810
2811our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 scrolled => (new CFClient::UI::Table), 2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2818 @_, 2778 @_,
2819 ); 2779 );
2820 2780
2821 $self 2781 $self
2822} 2782}
… …
2832 or ($a->{name} cmp $b->{name}) 2792 or ($a->{name} cmp $b->{name})
2833 } @$items; 2793 } @$items;
2834 2794
2835 $self->{real_items} = \@items; 2795 $self->{real_items} = \@items;
2836 2796
2797 my $row = 0;
2837 for my $item (@items) { 2798 for my $item (@items) {
2838 $item->{item} = $item; 2799 CFClient::Item::update_widgets $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842 2800
2843 my $i = 0; 2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2844 for (@items) { 2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2845 $self->{scrolled}->add (0, $i, $_); 2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2849 2804
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2805 $row++;
2806 }
2851} 2807}
2852 2808
2853sub size_request { 2809sub size_request {
2854 my ($self) = @_; 2810 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h}); 2811 ($self->{req_w}, $self->{req_h});
… …
2992sub add { 2948sub add {
2993 my ($self, $text, %arg) = @_; 2949 my ($self, $text, %arg) = @_;
2994 2950
2995 $text =~ s/^\s+//; 2951 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//; 2952 $text =~ s/\s+$//;
2953
2954 return unless $text;
2997 2955
2998 my $timeout = time + ((delete $arg{timeout}) || 60); 2956 my $timeout = time + ((delete $arg{timeout}) || 60);
2999 2957
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001 2959
… …
3045 3003
3046sub new { 3004sub new {
3047 my $class = shift; 3005 my $class = shift;
3048 3006
3049 $class->SUPER::new ( 3007 $class->SUPER::new (
3008 visible => 1,
3050 @_, 3009 @_,
3051 ) 3010 )
3052} 3011}
3053 3012
3054sub configure { 3013sub configure {
… …
3081 if exists $child->{req_x}; 3040 if exists $child->{req_x};
3082 3041
3083 $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
3084 if exists $child->{req_y}; 3043 if exists $child->{req_y};
3085 3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
3086 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3087 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088 3050
3089 $child->configure ($X, $Y, $W, $H); 3051 $child->configure ($X, $Y, $W, $H);
3090 } 3052 }
… …
3112sub add { 3074sub add {
3113 my ($self, @children) = @_; 3075 my ($self, @children) = @_;
3114 3076
3115 for (my @widgets = @children; my $w = pop @widgets; ) { 3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children; 3078 push @widgets, $w->children;
3117 $w->{root} = $self; 3079 $w->{root} = $self;
3118 $w->{visible} = 1; 3080 $w->{visible} = $self->{visible} + 1;
3119 } 3081 }
3120 3082
3121 for my $child (@children) { 3083 for my $child (@children) {
3122 $child->{is_toplevel} = 1; 3084 $child->{is_toplevel} = 1;
3123 3085
… …
3160 $_->() 3122 $_->()
3161 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
3162 } 3124 }
3163 3125
3164 if ($self->{check_size}) { 3126 if ($self->{check_size}) {
3165 my @queue = ([], []); 3127 my @queue;
3166 3128
3167 for (;;) { 3129 for (;;) {
3168 if ($self->{check_size}) { 3130 if ($self->{check_size}) {
3169 # heuristic: check containers last 3131 #TODO use array-of-depth approach
3170 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3132
3133 @queue = sort { $a->{visible} <=> $b->{visible} }
3171 for values %{delete $self->{check_size}} 3134 @queue, values %{delete $self->{check_size}};
3172 } 3135 }
3173 3136
3174 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3137 my $widget = pop @queue || last;
3138
3139 defined $widget->{visible} or last; # do not resize invisible widgets
3175 3140
3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3177 ? @$widget{qw(user_w user_h)} 3142 ? @$widget{qw(user_w user_h)}
3178 : $widget->size_request; 3143 : $widget->size_request;
3179 3144

Diff Legend

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