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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.249 by root, Sun May 28 01:40:02 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}) {
… …
50 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
74 check_tooltip; 94 check_tooltip;
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 check_tooltip;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
161 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
162 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
163 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
164 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
165 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
166 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
167 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
168 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
169 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
170 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
171 } 183 }
172 } 184 }
173 185
174 reconfigure_widgets; 186 reconfigure_widgets;
175} 187}
… …
192 can_events => 1, 204 can_events => 1,
193 @_ 205 @_
194 }, $class; 206 }, $class;
195 207
196 for (keys %$self) { 208 for (keys %$self) {
197 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
198 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
199 } 211 }
200 } 212 }
201 213
202 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
203 215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
204 $self 223 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
205} 234}
206 235
207sub destroy { 236sub destroy {
208 my ($self) = @_; 237 my ($self) = @_;
209 238
… …
211 %$self = (); 240 %$self = ();
212} 241}
213 242
214sub show { 243sub show {
215 my ($self) = @_; 244 my ($self) = @_;
245
216 return if $self->{parent}; 246 return if $self->{parent};
217 247
218 $CFClient::UI::ROOT->add ($self); 248 $CFClient::UI::ROOT->add ($self);
219} 249}
220 250
221sub show_centered { 251sub center {
222 my ($self) = @_; 252 my ($self) = @_;
223 return if $self->{parent};
224
225 $self->show;
226 253
227 $CFClient::UI::ROOT->on_post_alloc ( 254 $CFClient::UI::ROOT->on_post_alloc (
228 "centered $self" => sub { 255 "center_$self" => sub {
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 256 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
230 }, 257 },
231 ); 258 );
232}
233 259
234sub hide { 260 $self->update;
261}
262
263sub set_visible {
235 my ($self) = @_; 264 my ($self) = @_;
265
266 return if $self->{visible};
267
268 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1;
270
271 $self->emit (visibility_change => 1);
272}
273
274sub set_invisible {
275 my ($self) = @_;
276
277 return unless $self->{visible};
278
279 # broken show/hide model
280
281 delete $self->{root};
282 delete $self->{visible};
236 283
237 undef $GRAB if $GRAB == $self; 284 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 285 undef $HOVER if $HOVER == $self;
286
287 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self;
289
290 $self->focus_out;
291
292 $self->emit (visibility_change => 0);
293}
294
295sub hide {
296 my ($self) = @_;
297
298 $self->set_invisible;
239 299
240 $self->{parent}->remove ($self) 300 $self->{parent}->remove ($self)
241 if $self->{parent}; 301 if $self->{parent};
242} 302}
243 303
… …
252} 312}
253 313
254sub set_size { 314sub set_size {
255 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
256 316
257 $self->{user_w} = $w; 317 $self->{def_w} = $w;
258 $self->{user_h} = $h; 318 $self->{def_h} = $h;
259 319
260 $self->check_size; 320 $self->check_size;
261} 321}
262 322
263sub size_request { 323sub size_request {
… …
313} 373}
314 374
315sub set_tooltip { 375sub set_tooltip {
316 my ($self, $tooltip) = @_; 376 my ($self, $tooltip) = @_;
317 377
378 $tooltip =~ s/^\s+//;
379 $tooltip =~ s/\s+$//;
380
381 return if $self->{tooltip} eq $tooltip;
382
318 $self->{tooltip} = $tooltip; 383 $self->{tooltip} = $tooltip;
319 384
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 385 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner}; 386 delete $CFClient::UI::TOOLTIP->{owner};
322 CFClient::UI::check_tooltip; 387 CFClient::UI::check_tooltip;
… …
343 return if $FOCUS == $self; 408 return if $FOCUS == $self;
344 return unless $self->{can_focus}; 409 return unless $self->{can_focus};
345 410
346 my $focus = $FOCUS; $FOCUS = $self; 411 my $focus = $FOCUS; $FOCUS = $self;
347 412
348 $self->emit (focus_in => $focus); 413 $self->_emit (focus_in => $focus);
349 414
350 $focus->update if $focus; 415 $focus->update if $focus;
351 $FOCUS->update; 416 $FOCUS->update;
352} 417}
353 418
… …
356 421
357 return unless $FOCUS == $self; 422 return unless $FOCUS == $self;
358 423
359 my $focus = $FOCUS; undef $FOCUS; 424 my $focus = $FOCUS; undef $FOCUS;
360 425
361 $self->emit (focus_out => $focus); 426 $self->_emit (focus_out => $focus);
362 427
363 $focus->update if $focus; #? 428 $focus->update if $focus; #?
429
430 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
431 unless $FOCUS;
364} 432}
365 433
366sub mouse_motion { } 434sub mouse_motion { }
367sub button_up { } 435sub button_up { }
368sub key_down { } 436sub key_down { }
369sub key_up { } 437sub key_up { }
370 438
371sub button_down { 439sub button_down {
372 my ($self, $ev, $x, $y) = @_; 440 my ($self, $ev, $x, $y) = @_;
373 441
374 $self->focus_in; 442 $self->focus_in;
… …
408 if ($ENV{PCLIENT_DEBUG}) { 476 if ($ENV{PCLIENT_DEBUG}) {
409 glPushMatrix; 477 glPushMatrix;
410 glColor 1, 1, 0, 1; 478 glColor 1, 1, 0, 1;
411 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
412 glBegin GL_LINE_LOOP; 480 glBegin GL_LINE_LOOP;
413 glVertex 0 , 0; 481 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 482 glVertex $self->{w} - 1, 0;
415 glVertex $self->{w}, $self->{h}; 483 glVertex $self->{w} - 1, $self->{h} - 1;
416 glVertex 0 , $self->{h}; 484 glVertex 0 , $self->{h} - 1;
417 glEnd; 485 glEnd;
418 glPopMatrix; 486 glPopMatrix;
419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 487 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
420 } 488 }
421} 489}
… …
441sub set_parent { 509sub set_parent {
442 my ($self, $parent) = @_; 510 my ($self, $parent) = @_;
443 511
444 Scalar::Util::weaken ($self->{parent} = $parent); 512 Scalar::Util::weaken ($self->{parent} = $parent);
445 513
446 # TODO: req_w _does_change after ->reconfigure 514 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
515
447 $self->check_size 516 $self->check_size;
448 unless exists $self->{req_w};
449
450 $self->show;
451} 517}
452 518
453sub check_size { 519sub check_size {
454 my ($self, $forced) = @_; 520 my ($self, $forced) = @_;
455 521
… …
468 my ($self, $signal, $cb) = @_; 534 my ($self, $signal, $cb) = @_;
469 535
470 push @{ $self->{signal_cb}{$signal} }, $cb; 536 push @{ $self->{signal_cb}{$signal} }, $cb;
471} 537}
472 538
539sub _emit {
540 my ($self, $signal, @args) = @_;
541
542 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
543}
544
473sub emit { 545sub emit {
474 my ($self, $signal, @args) = @_; 546 my ($self, $signal, @args) = @_;
475 547
476 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 548 $self->_emit ($signal, @args)
549 || $self->$signal (@args);
550}
551
552sub visibility_change {
553 #my ($self, $visible) = @_;
477} 554}
478 555
479sub DESTROY { 556sub DESTROY {
480 my ($self) = @_; 557 my ($self) = @_;
481 558
… …
594 delete $child->{parent}; 671 delete $child->{parent};
595 $child->hide; 672 $child->hide;
596 673
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 675
599 $self->check_size; 676 $self->check_size (1);
600 $self->update; 677 $self->update;
601} 678}
602 679
603sub clear { 680sub clear {
604 my ($self) = @_; 681 my ($self) = @_;
… …
744 821
745package CFClient::UI::ViewPort; 822package CFClient::UI::ViewPort;
746 823
747our @ISA = CFClient::UI::Window::; 824our @ISA = CFClient::UI::Window::;
748 825
826sub new {
827 my $class = shift;
828
829 $class->SUPER::new (
830 scroll_x => 0,
831 scroll_y => 1,
832 @_,
833 )
834}
835
749sub size_request { 836sub size_request {
750 my ($self) = @_; 837 my ($self) = @_;
751 838
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 839 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
753 840
754 @$self{qw(child_w child_h)} 841 $w = 10 if $self->{scroll_x};
842 $h = 10 if $self->{scroll_y};
843
844 ($w, $h)
755} 845}
756 846
757sub size_allocate { 847sub size_allocate {
758 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
759 849
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 850 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
761# $w = $self->{w}; 851 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
852
762 $self->child->configure (0, 0, $cw, $ch); 853 $self->child->configure (0, 0, $w, $h);
763 $self->update; 854 $self->update;
764} 855}
765 856
766sub set_offset { 857sub set_offset {
767 my ($self, $x, $y) = @_; 858 my ($self, $x, $y) = @_;
… …
818 my $class = shift; 909 my $class = shift;
819 910
820 my $self; 911 my $self;
821 912
822 my $slider = new CFClient::UI::Slider 913 my $slider = new CFClient::UI::Slider
823 vertical => 1, 914 vertical => 1,
824 range => [0, 0, 1, 0.01], # HACK fix 915 range => [0, 0, 1, 0.01], # HACK fix
825 connect_changed => sub { 916 on_changed => sub {
826 $self->{vp}->set_offset (0, $_[1]); 917 $self->{vp}->set_offset (0, $_[1]);
827 }, 918 },
828 ; 919 ;
829 920
830 $self = $class->SUPER::new ( 921 $self = $class->SUPER::new (
… …
836 $self->{vp}->add ($self->{scrolled}); 927 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp}); 928 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 929 $self->add ($self->{slider});
839 930
840 $self 931 $self
932}
933
934sub update {
935 my ($self) = @_;
936
937 $self->SUPER::update;
938
939 # todo: overwrite size_allocate of child
940 my $child = $self->{vp}->child;
941 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
841} 942}
842 943
843sub size_allocate { 944sub size_allocate {
844 my ($self, $w, $h) = @_; 945 my ($self, $w, $h) = @_;
845 946
… …
904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1005 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
905 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1006 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
906 1007
907sub new { 1008sub new {
908 my $class = shift; 1009 my $class = shift;
909
910 # TODO: user_x, user_y, overwrite moveto?
911 1010
912 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
913 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
914 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
915 border => 0.6, 1014 border => 0.6,
… …
975 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
976 1075
977 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
979 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
983 $self->check_size; 1084 $self->check_size;
984 }; 1085 };
985 1086
986 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
987 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
990 $self->{motion} = sub { 1091 $self->{motion} = sub {
991 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
992 1093
993 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
994 1095
995 $self->move ($bx + $x - $ox, $by + $y - $oy); 1096 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy;
1098
1099 $self->move ($self->{user_x}, $self->{user_y});
996 $self->update; 1100 $self->update;
997 }; 1101 };
998 } 1102 }
999} 1103}
1000 1104
… …
1062sub new { 1166sub new {
1063 my $class = shift; 1167 my $class = shift;
1064 1168
1065 $class->SUPER::new ( 1169 $class->SUPER::new (
1066 col_expand => [], 1170 col_expand => [],
1067 @_ 1171 @_,
1068 ) 1172 )
1173}
1174
1175sub children {
1176 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1177}
1070 1178
1071sub add { 1179sub add {
1072 my ($self, $x, $y, $child) = @_; 1180 my ($self, $x, $y, $child) = @_;
1073 1181
1074 $child->set_parent ($self); 1182 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1183 $self->{children}[$y][$x] = $child;
1076 1184
1077 $child->check_size; 1185 $self->check_size (1);
1078} 1186}
1079 1187
1080sub children {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1082}
1083
1084# TODO: move to container class maybe? send childs a signal on removal? 1188# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1189sub clear {
1086 my ($self) = @_; 1190 my ($self) = @_;
1087 1191
1088 my @children = $self->children; 1192 my @children = $self->children;
1089 delete $self->{children}; 1193 delete $self->{children};
… …
1091 for (@children) { 1195 for (@children) {
1092 delete $_->{parent}; 1196 delete $_->{parent};
1093 $_->hide; 1197 $_->hide;
1094 } 1198 }
1095 1199
1200 $self->check_size (1);
1096 $self->update; 1201 $self->update;
1097} 1202}
1098 1203
1099sub get_wh { 1204sub get_wh {
1100 my ($self) = @_; 1205 my ($self) = @_;
… …
1132sub size_allocate { 1237sub size_allocate {
1133 my ($self, $w, $h) = @_; 1238 my ($self, $w, $h) = @_;
1134 1239
1135 my ($ws, $hs) = $self->get_wh; 1240 my ($ws, $hs) = $self->get_wh;
1136 1241
1137 my $req_w = sum @$ws; 1242 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1243 my $req_h = (sum @$hs) || 1;
1139 1244
1140 # TODO: nicer code && do row_expand 1245 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1246 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1247 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1248 my $col_expand = (sum @col_expand) || 1;
… …
1197 } 1302 }
1198} 1303}
1199 1304
1200############################################################################# 1305#############################################################################
1201 1306
1202package CFClient::UI::HBox; 1307package CFClient::UI::Box;
1203
1204# TODO: wrap into common Box base class
1205 1308
1206our @ISA = CFClient::UI::Container::; 1309our @ISA = CFClient::UI::Container::;
1207 1310
1208sub size_request { 1311sub size_request {
1209 my ($self) = @_; 1312 my ($self) = @_;
1210 1313
1211 my @alloc = map [$_->size_request], @{$self->{children}}; 1314 $self->{vertical}
1212 1315 ? (
1213 ( 1316 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1214 (List::Util::sum map $_->[0], @alloc), 1317 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1215 (List::Util::max map $_->[1], @alloc), 1318 )
1216 ) 1319 : (
1320 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1321 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1322 )
1217} 1323}
1218 1324
1219sub size_allocate { 1325sub size_allocate {
1220 my ($self, $w, $h) = @_; 1326 my ($self, $w, $h) = @_;
1221 1327
1222 ($h, $w) = ($w, $h); 1328 my $space = $self->{vertical} ? $h : $w;
1223
1224 my $children = $self->{children}; 1329 my $children = $self->{children};
1225 1330
1226 my @h = map $_->{req_w}, @$children; 1331 my @req;
1227 1332
1228 my $req_h = List::Util::sum @h; 1333 if ($self->{homogeneous}) {
1229 1334 @req = ($space / (@$children || 1)) x @$children;
1230 if ($req_h > $h) {
1231 # ah well, not enough space
1232 $_ *= $h / $req_h for @h;
1233 } else { 1335 } else {
1336 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1337 my $req = List::Util::sum @req;
1338
1339 if ($req > $space) {
1340 # ah well, not enough space
1341 $_ *= $space / $req for @req;
1342 } else {
1234 my $exp = List::Util::sum map $_->{expand}, @$children; 1343 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1235 $exp ||= 1;
1236 1344
1345 $space = ($space - $req) / $expand; # remaining space to give away
1346
1347 $req[$_] += $space * $children->[$_]{expand}
1237 for (0 .. $#$children) { 1348 for 0 .. $#$children;
1238 my $child = $children->[$_];
1239
1240 my $alloc_h = $h[$_];
1241 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1242 $h[$_] = $alloc_h;
1243 } 1349 }
1244 } 1350 }
1245 1351
1246 CFClient::UI::harmonize \@h; 1352 CFClient::UI::harmonize \@req;
1247 1353
1248 my $y = 0; 1354 my $pos = 0;
1249 for (0 .. $#$children) { 1355 for (0 .. $#$children) {
1250 my $child = $children->[$_];
1251 my $h = $h[$_]; 1356 my $alloc = $req[$_];
1252 $child->configure ($y, 0, $h, $w); 1357 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1253 1358
1254 $y += $h; 1359 $pos += $alloc;
1255 } 1360 }
1256 1361
1257 1 1362 1
1258} 1363}
1259 1364
1260############################################################################# 1365#############################################################################
1261 1366
1367package CFClient::UI::HBox;
1368
1369our @ISA = CFClient::UI::Box::;
1370
1371sub new {
1372 my $class = shift;
1373
1374 $class->SUPER::new (
1375 vertical => 0,
1376 @_,
1377 )
1378}
1379
1380#############################################################################
1381
1262package CFClient::UI::VBox; 1382package CFClient::UI::VBox;
1263 1383
1264# TODO: wrap into common Box base class
1265
1266our @ISA = CFClient::UI::Container::; 1384our @ISA = CFClient::UI::Box::;
1267 1385
1268sub size_request { 1386sub new {
1269 my ($self) = @_; 1387 my $class = shift;
1270 1388
1271 my @alloc = map [$_->size_request], @{$self->{children}}; 1389 $class->SUPER::new (
1272 1390 vertical => 1,
1273 ( 1391 @_,
1274 (List::Util::max map $_->[0], @alloc),
1275 (List::Util::sum map $_->[1], @alloc),
1276 ) 1392 )
1277}
1278
1279sub size_allocate {
1280 my ($self, $w, $h) = @_;
1281
1282 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1283
1284 my $children = $self->{children};
1285
1286 my @h = map $_->{req_h}, @$children;
1287
1288 my $req_h = List::Util::sum @h;
1289
1290 if ($req_h > $h) {
1291 # ah well, not enough space
1292 $_ *= $h / $req_h for @h;
1293 } else {
1294 my $exp = List::Util::sum map $_->{expand}, @$children;
1295 $exp ||= 1;
1296
1297 for (0 .. $#$children) {
1298 my $child = $children->[$_];
1299
1300 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1301 }
1302 }
1303
1304 CFClient::UI::harmonize \@h;
1305
1306 my $y = 0;
1307 for (0 .. $#$children) {
1308 my $child = $children->[$_];
1309 my $h = $h[$_];
1310 $child->configure (0, $y, $w, $h);
1311
1312 $y += $h;
1313 }
1314
1315 1
1316} 1393}
1317 1394
1318############################################################################# 1395#############################################################################
1319 1396
1320package CFClient::UI::Label; 1397package CFClient::UI::Label;
… …
1524 $self->{text} = $text; 1601 $self->{text} = $text;
1525 1602
1526 $text =~ s/./*/g if $self->{hidden}; 1603 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1604 $self->{layout}->set_text ("$text ");
1528 1605
1529 $self->emit (changed => $self->{text}); 1606 $self->_emit (changed => $self->{text});
1530} 1607}
1531 1608
1532sub set_text { 1609sub set_text {
1533 my ($self, $text) = @_; 1610 my ($self, $text) = @_;
1534 1611
… …
1546 my ($self) = @_; 1623 my ($self) = @_;
1547 1624
1548 my ($w, $h) = $self->SUPER::size_request; 1625 my ($w, $h) = $self->SUPER::size_request;
1549 1626
1550 ($w + 1, $h) # add 1 for cursor 1627 ($w + 1, $h) # add 1 for cursor
1551}
1552
1553sub size_allocate {
1554 my ($self, $w, $h) = @_;
1555
1556 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1557} 1628}
1558 1629
1559sub key_down { 1630sub key_down {
1560 my ($self, $ev) = @_; 1631 my ($self, $ev) = @_;
1561 1632
… …
1576 } elsif ($sym == CFClient::SDLK_HOME) { 1647 } elsif ($sym == CFClient::SDLK_HOME) {
1577 $self->{cursor} = 0; 1648 $self->{cursor} = 0;
1578 } elsif ($sym == CFClient::SDLK_END) { 1649 } elsif ($sym == CFClient::SDLK_END) {
1579 $self->{cursor} = length $text; 1650 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1651 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1652 $self->_emit ('escape');
1582 } elsif ($uni) { 1653 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1654 substr $text, $self->{cursor}++, 0, chr $uni;
1584 } 1655 }
1585 1656
1586 $self->_set_text ($text); 1657 $self->_set_text ($text);
… …
1673 if ($sym == 13) { 1744 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1745 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1746 my $txt = $self->get_text;
1676 $self->{history_pointer} = -1; 1747 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1748 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1749 $self->_emit (activate => $txt);
1679 $self->update; 1750 $self->update;
1680 1751
1681 } elsif ($sym == CFClient::SDLK_UP) { 1752 } elsif ($sym == CFClient::SDLK_UP) {
1682 if ($self->{history_pointer} < 0) { 1753 if ($self->{history_pointer} < 0) {
1683 $self->{history_saveback} = $self->get_text; 1754 $self->{history_saveback} = $self->get_text;
… …
1731 can_events => 1, 1802 can_events => 1,
1732 @_ 1803 @_
1733 ) 1804 )
1734} 1805}
1735 1806
1807sub activate { }
1808
1736sub button_up { 1809sub button_up {
1737 my ($self, $ev, $x, $y) = @_; 1810 my ($self, $ev, $x, $y) = @_;
1738 1811
1812 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1813 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1814 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate");
1742 }
1743} 1815}
1744 1816
1745sub _draw { 1817sub _draw {
1746 my ($self) = @_; 1818 my ($self) = @_;
1747 1819
… …
1799 my ($self, $ev, $x, $y) = @_; 1871 my ($self, $ev, $x, $y) = @_;
1800 1872
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1803 $self->{state} = !$self->{state}; 1875 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 1876 $self->_emit (changed => $self->{state});
1805 } 1877 }
1806} 1878}
1807 1879
1808sub _draw { 1880sub _draw {
1809 my ($self) = @_; 1881 my ($self) = @_;
… …
2102} 2174}
2103 2175
2104sub set_range { 2176sub set_range {
2105 my ($self, $range) = @_; 2177 my ($self, $range) = @_;
2106 2178
2107 $self->{range} = $range; 2179 ($range, $self->{range}) = ($self->{range}, $range);
2108 2180
2109 $self->update; 2181 $self->update
2182 if "@$range" ne "@{$self->{range}}";
2110} 2183}
2111 2184
2112sub set_value { 2185sub set_value {
2113 my ($self, $value) = @_; 2186 my ($self, $value) = @_;
2114 2187
… …
2125 if $unit; 2198 if $unit;
2126 2199
2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2200 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128 2201
2129 if ($value != $old_value) { 2202 if ($value != $old_value) {
2130 $self->emit (changed => $value); 2203 $self->_emit (changed => $value);
2131 $self->update; 2204 $self->update;
2132 } 2205 }
2133} 2206}
2134 2207
2135sub size_request { 2208sub size_request {
… …
2497 2570
2498sub new { 2571sub new {
2499 my $class = shift; 2572 my $class = shift;
2500 2573
2501 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2502 state => 0, 2575 state => 0,
2503 connect_activate => \&toggle_flopper, 2576 on_activate => \&toggle_flopper,
2504 @_ 2577 @_
2505 ); 2578 );
2506 2579
2507 if ($self->{state}) {
2508 $self->{state} = 0;
2509 $self->toggle_flopper;
2510 }
2511
2512 $self 2580 $self
2513} 2581}
2514 2582
2515sub toggle_flopper { 2583sub toggle_flopper {
2516 my ($self) = @_; 2584 my ($self) = @_;
2517 2585
2518 # TODO: use animation 2586 $self->{other}->toggle_visibility;
2519 if ($self->{state} = !$self->{state}) {
2520 $CFClient::UI::ROOT->add ($self->{other});
2521 $self->{other}->move ($self->coord2global (0, $self->{h}));
2522 $self->emit ("open");
2523 } else {
2524 $CFClient::UI::ROOT->remove ($self->{other});
2525 $self->emit ("close");
2526 }
2527
2528 $self->emit (changed => $self->{state});
2529} 2587}
2530 2588
2531############################################################################# 2589#############################################################################
2532 2590
2533package CFClient::UI::Tooltip; 2591package CFClient::UI::Tooltip;
… …
2609 2667
2610sub new { 2668sub new {
2611 my $class = shift; 2669 my $class = shift;
2612 2670
2613 my $self = $class->SUPER::new ( 2671 my $self = $class->SUPER::new (
2614 aspect => 1, 2672 aspect => 1,
2673 can_events => 0,
2615 @_, 2674 @_,
2616 ); 2675 );
2617 2676
2618 if ($self->{anim} && $self->{animspeed}) { 2677 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2678 Scalar::Util::weaken (my $widget = $self);
… …
2678 $self->SUPER::DESTROY; 2737 $self->SUPER::DESTROY;
2679} 2738}
2680 2739
2681############################################################################# 2740#############################################################################
2682 2741
2683package CFClient::UI::InventoryItem; 2742package CFClient::UI::Inventory;
2684 2743
2685our @ISA = CFClient::UI::HBox::; 2744our @ISA = CFClient::UI::ScrolledWindow::;
2686
2687sub _item_to_desc {
2688 my ($item) = @_;
2689
2690 my $desc =
2691 $item->{nrof} < 2
2692 ? $item->{name}
2693 : "$item->{nrof} × $item->{name_pl}";
2694
2695 $item->{flags} & Crossfire::Protocol::F_OPEN
2696 and $desc .= " (open)";
2697 $item->{flags} & Crossfire::Protocol::F_APPLIED
2698 and $desc .= " (applied)";
2699 $item->{flags} & Crossfire::Protocol::F_UNPAID
2700 and $desc .= " (unpaid)";
2701 $item->{flags} & Crossfire::Protocol::F_MAGIC
2702 and $desc .= " (magic)";
2703 $item->{flags} & Crossfire::Protocol::F_CURSED
2704 and $desc .= " (cursed)";
2705 $item->{flags} & Crossfire::Protocol::F_DAMNED
2706 and $desc .= " (damned)";
2707 $item->{flags} & Crossfire::Protocol::F_LOCKED
2708 and $desc .= " *";
2709
2710 $desc
2711}
2712 2745
2713sub new { 2746sub new {
2714 my $class = shift; 2747 my $class = shift;
2715 2748
2716 my %args = @_;
2717
2718 my $item = delete $args{item};
2719
2720 my $desc = _item_to_desc ($item);
2721
2722 my $self = $class->SUPER::new ( 2749 my $self = $class->SUPER::new (
2723 can_hover => 1,
2724 can_events => 1,
2725 tooltip => ((CFClient::UI::Label::escape $desc)
2726 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2727 connect_button_down => sub {
2728 my ($self, $ev, $x, $y) = @_;
2729
2730 # todo: maybe put examine on 1? but should just be a tooltip :(
2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2732 my $targ = $::CONN->{player}{tag};
2733
2734 if ($item->{container} == $::CONN->{player}{tag}) {
2735 $targ = $main::OPENCONT;
2736 }
2737
2738 $::CONN->send ("move $targ $item->{tag} 0");
2739 } elsif ($ev->{button} == 1) {
2740 $::CONN->send ("examine $item->{tag}");
2741 } elsif ($ev->{button} == 2) {
2742 $::CONN->send ("apply $item->{tag}");
2743 } elsif ($ev->{button} == 3) {
2744 my @menu_items = (
2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2746 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2747 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748 (
2749 $item->{flags} & Crossfire::Protocol::F_LOCKED
2750 ? (
2751 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752 )
2753 : (
2754 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2755 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2756 )
2757 ),
2758 );
2759
2760 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2761 }
2762
2763 1
2764 },
2765 %args
2766 );
2767
2768
2769 $self->add (new CFClient::UI::Face
2770 can_events => 0,
2771 face => $item->{face},
2772 anim => $item->{anim},
2773 animspeed => $item->{animspeed},
2774 );
2775
2776 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2777
2778 $self->{item} = $item;
2779
2780 $self->update_item;
2781
2782 $self
2783}
2784
2785sub update_item {
2786 my ($self) = @_;
2787
2788 my $desc = _item_to_desc ($self->{item});
2789
2790 $self->{name_lbl}->set_text ($desc);
2791}
2792
2793#############################################################################
2794
2795package CFClient::UI::Inventory;
2796
2797our @ISA = CFClient::UI::ScrolledWindow::;
2798
2799sub new {
2800 my $class = shift;
2801
2802 my $self = $class->SUPER::new (
2803 scrolled => (new CFClient::UI::Table), 2750 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2804 @_, 2751 @_,
2805 ); 2752 );
2806 2753
2807 $self 2754 $self
2808} 2755}
… …
2818 or ($a->{name} cmp $b->{name}) 2765 or ($a->{name} cmp $b->{name})
2819 } @$items; 2766 } @$items;
2820 2767
2821 $self->{real_items} = \@items; 2768 $self->{real_items} = \@items;
2822 2769
2770 my $row = 0;
2823 for my $item (@items) { 2771 for my $item (@items) {
2824 $item->{item} = $item; 2772 CFClient::Item::update_widgets $item;
2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2827 }
2828 2773
2829 my $i = 0; 2774 $self->{scrolled}->add (0, $row, $item->{face_widget});
2830 for (@items) { 2775 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2831 $self->{scrolled}->add (0, $i, $_); 2776 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2832 my $nrof = $_->{item}->{nrof} || 1;
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834 }
2835 2777
2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2778 $row++;
2837} 2779 }
2838
2839sub size_request {
2840 my ($self) = @_;
2841 ($self->{req_w}, $self->{req_h});
2842} 2780}
2843 2781
2844############################################################################# 2782#############################################################################
2845 2783
2846package CFClient::UI::Menu; 2784package CFClient::UI::Menu;
… …
2881 2819
2882# popup given the event (must be a mouse button down event currently) 2820# popup given the event (must be a mouse button down event currently)
2883sub popup { 2821sub popup {
2884 my ($self, $ev) = @_; 2822 my ($self, $ev) = @_;
2885 2823
2886 $self->emit ("popdown"); 2824 $self->_emit ("popdown");
2887 2825
2888 # maybe save $GRAB? must be careful about events... 2826 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 2827 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 2828 $self->{button} = $ev->{button};
2891 2829
… …
2906 2844
2907 if ($ev->{button} == $self->{button}) { 2845 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 2846 undef $GRAB;
2909 $self->hide; 2847 $self->hide;
2910 2848
2911 $self->emit ("popdown"); 2849 $self->_emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 2850 $self->{hover}[1]->() if $self->{hover};
2913 } 2851 }
2914} 2852}
2915 2853
2916############################################################################# 2854#############################################################################
… …
2978sub add { 2916sub add {
2979 my ($self, $text, %arg) = @_; 2917 my ($self, $text, %arg) = @_;
2980 2918
2981 $text =~ s/^\s+//; 2919 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 2920 $text =~ s/\s+$//;
2921
2922 return unless $text;
2983 2923
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 2924 my $timeout = time + ((delete $arg{timeout}) || 60);
2985 2925
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2926 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 2927
… …
3031 2971
3032sub new { 2972sub new {
3033 my $class = shift; 2973 my $class = shift;
3034 2974
3035 $class->SUPER::new ( 2975 $class->SUPER::new (
2976 visible => 1,
3036 @_, 2977 @_,
3037 ) 2978 )
3038} 2979}
3039 2980
3040sub configure { 2981sub configure {
… …
3067 if exists $child->{req_x}; 3008 if exists $child->{req_x};
3068 3009
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3010 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3070 if exists $child->{req_y}; 3011 if exists $child->{req_y};
3071 3012
3013 delete @$child{qw(req_x req_y)};
3014
3072 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3015 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3073 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3016 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3074 3017
3075 $child->configure ($X, $Y, $W, $H); 3018 $child->configure ($X, $Y, $W, $H);
3076 } 3019 }
… …
3095 $::WANT_REFRESH++; 3038 $::WANT_REFRESH++;
3096} 3039}
3097 3040
3098sub add { 3041sub add {
3099 my ($self, @children) = @_; 3042 my ($self, @children) = @_;
3100
3101 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children;
3103 $w->{root} = $self;
3104 $w->{visible} = 1;
3105 }
3106 3043
3107 for my $child (@children) { 3044 for my $child (@children) {
3108 $child->{is_toplevel} = 1; 3045 $child->{is_toplevel} = 1;
3109 3046
3110 # integerise window positions 3047 # integerise window positions
3111 $child->{x} = int $child->{x}; 3048 $child->{x} = int $child->{x};
3112 $child->{y} = int $child->{y}; 3049 $child->{y} = int $child->{y};
3113 } 3050 }
3114 3051
3115 $self->SUPER::add (@children); 3052 $self->SUPER::add (@children);
3053
3054 for (my @widgets = @children; my $w = pop @widgets; ) {
3055 push @widgets, $w->children;
3056 $w->set_visible;
3057 }
3058
3116} 3059}
3117 3060
3118sub remove { 3061sub remove {
3119 my ($self, @children) = @_; 3062 my ($self, @children) = @_;
3120 3063
3121 $self->SUPER::remove (@children); 3064 $self->SUPER::remove (@children);
3122 3065
3123 while (@children) { 3066 while (@children) {
3124 my $w = pop @children; 3067 my $w = pop @children;
3125 push @children, $w->children; 3068 push @children, $w->children;
3126 delete $w->{visible}; 3069 $w->set_invisible;
3127 } 3070 }
3128} 3071}
3129 3072
3130sub on_refresh { 3073sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3074 my ($self, $id, $cb) = @_;
… …
3146 $_->() 3089 $_->()
3147 for values %{delete $self->{refresh_hook}}; 3090 for values %{delete $self->{refresh_hook}};
3148 } 3091 }
3149 3092
3150 if ($self->{check_size}) { 3093 if ($self->{check_size}) {
3151 my @queue = ([], []); 3094 my @queue;
3152 3095
3153 for (;;) { 3096 for (;;) {
3154 if ($self->{check_size}) { 3097 if ($self->{check_size}) {
3155 # heuristic: check containers last 3098 #TODO use array-of-depth approach
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3099
3100 @queue = sort { $a->{visible} <=> $b->{visible} }
3157 for values %{delete $self->{check_size}} 3101 @queue, values %{delete $self->{check_size}};
3158 } 3102 }
3159 3103
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3104 my $widget = pop @queue || last;
3161 3105
3106 defined $widget->{visible} or last; # do not resize invisible widgets
3107
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3163 ? @$widget{qw(user_w user_h)} 3109 ? @$widget{qw(def_w def_h)}
3164 : $widget->size_request; 3110 : $widget->size_request;
3165 3111
3166 if (delete $widget->{force_alloc} 3112 if (delete $widget->{force_alloc}
3167 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3113 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3168 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3114 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
… …
3177 } 3123 }
3178 } 3124 }
3179 } 3125 }
3180 3126
3181 while ($self->{size_alloc}) { 3127 while ($self->{size_alloc}) {
3128 for (
3129 sort { $a->[0]{visible} <=> $b->[0]{visible} }
3182 for (values %{delete $self->{size_alloc}}) { 3130 values %{delete $self->{size_alloc}}
3131 ) {
3183 my ($widget, $w, $h) = @$_; 3132 my ($widget, $w, $h) = @$_;
3184 3133
3185 $w = 0 if $w < 0; 3134 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3135 $h = 0 if $h < 0;
3187 3136
3188 $widget->{w} = $w; 3137 $widget->{w} = $w;
3189 $widget->{h} = $h; 3138 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h);
3191 $widget->emit (size_allocate => $w, $h); 3139 $widget->emit (size_allocate => $w, $h);
3192 } 3140 }
3193 } 3141 }
3194 3142
3195 while ($self->{post_alloc_hook}) { 3143 while ($self->{post_alloc_hook}) {

Diff Legend

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