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.229 by root, Wed May 24 21:49:58 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) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
158 $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};
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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};
163 $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};
164 $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};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 183 }
167
168 $widget->reconfigure;
169 } 184 }
185
186 reconfigure_widgets;
170} 187}
171 188
172############################################################################# 189#############################################################################
173 190
174package CFClient::UI::Base; 191package CFClient::UI::Base;
… …
187 can_events => 1, 204 can_events => 1,
188 @_ 205 @_
189 }, $class; 206 }, $class;
190 207
191 for (keys %$self) { 208 for (keys %$self) {
192 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
194 } 211 }
195 } 212 }
196 213
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198 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
199 $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 }
200} 234}
201 235
202sub destroy { 236sub destroy {
203 my ($self) = @_; 237 my ($self) = @_;
204 238
… …
206 %$self = (); 240 %$self = ();
207} 241}
208 242
209sub show { 243sub show {
210 my ($self) = @_; 244 my ($self) = @_;
245
211 return if $self->{parent}; 246 return if $self->{parent};
212 247
213 $CFClient::UI::ROOT->add ($self); 248 $CFClient::UI::ROOT->add ($self);
214} 249}
215 250
216sub show_centered { 251sub center {
217 my ($self) = @_; 252 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221 253
222 $CFClient::UI::ROOT->on_post_alloc ( 254 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub { 255 "center_$self" => sub {
224 $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);
225 }, 257 },
226 ); 258 );
227}
228 259
229sub hide { 260 $self->update;
261}
262
263sub set_visible {
230 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};
231 283
232 undef $GRAB if $GRAB == $self; 284 undef $GRAB if $GRAB == $self;
233 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;
234 299
235 $self->{parent}->remove ($self) 300 $self->{parent}->remove ($self)
236 if $self->{parent}; 301 if $self->{parent};
237} 302}
238 303
… …
247} 312}
248 313
249sub set_size { 314sub set_size {
250 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
251 316
252 $self->{user_w} = $w; 317 $self->{def_w} = $w;
253 $self->{user_h} = $h; 318 $self->{def_h} = $h;
254 319
255 $self->check_size; 320 $self->check_size;
256} 321}
257 322
258sub size_request { 323sub size_request {
… …
308} 373}
309 374
310sub set_tooltip { 375sub set_tooltip {
311 my ($self, $tooltip) = @_; 376 my ($self, $tooltip) = @_;
312 377
378 $tooltip =~ s/^\s+//;
379 $tooltip =~ s/\s+$//;
380
381 return if $self->{tooltip} eq $tooltip;
382
313 $self->{tooltip} = $tooltip; 383 $self->{tooltip} = $tooltip;
314 384
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 385 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 386 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 387 CFClient::UI::check_tooltip;
… …
338 return if $FOCUS == $self; 408 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 409 return unless $self->{can_focus};
340 410
341 my $focus = $FOCUS; $FOCUS = $self; 411 my $focus = $FOCUS; $FOCUS = $self;
342 412
343 $self->emit (focus_in => $focus); 413 $self->_emit (focus_in => $focus);
344 414
345 $focus->update if $focus; 415 $focus->update if $focus;
346 $FOCUS->update; 416 $FOCUS->update;
347} 417}
348 418
… …
351 421
352 return unless $FOCUS == $self; 422 return unless $FOCUS == $self;
353 423
354 my $focus = $FOCUS; undef $FOCUS; 424 my $focus = $FOCUS; undef $FOCUS;
355 425
356 $self->emit (focus_out => $focus); 426 $self->_emit (focus_out => $focus);
357 427
358 $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;
359} 432}
360 433
361sub mouse_motion { } 434sub mouse_motion { }
362sub button_up { } 435sub button_up { }
363sub key_down { } 436sub key_down { }
364sub key_up { } 437sub key_up { }
365 438
366sub button_down { 439sub button_down {
367 my ($self, $ev, $x, $y) = @_; 440 my ($self, $ev, $x, $y) = @_;
368 441
369 $self->focus_in; 442 $self->focus_in;
… …
403 if ($ENV{PCLIENT_DEBUG}) { 476 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix; 477 glPushMatrix;
405 glColor 1, 1, 0, 1; 478 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 480 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 481 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 482 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 483 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 484 glVertex 0 , $self->{h} - 1;
412 glEnd; 485 glEnd;
413 glPopMatrix; 486 glPopMatrix;
414 #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;
415 } 488 }
416} 489}
… …
436sub set_parent { 509sub set_parent {
437 my ($self, $parent) = @_; 510 my ($self, $parent) = @_;
438 511
439 Scalar::Util::weaken ($self->{parent} = $parent); 512 Scalar::Util::weaken ($self->{parent} = $parent);
440 513
441 # TODO: req_w _does_change after ->reconfigure 514 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
515
442 $self->check_size 516 $self->check_size;
443 unless exists $self->{req_w};
444
445 $self->show;
446} 517}
447 518
448sub check_size { 519sub check_size {
449 my ($self, $forced) = @_; 520 my ($self, $forced) = @_;
450 521
… …
463 my ($self, $signal, $cb) = @_; 534 my ($self, $signal, $cb) = @_;
464 535
465 push @{ $self->{signal_cb}{$signal} }, $cb; 536 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 537}
467 538
539sub _emit {
540 my ($self, $signal, @args) = @_;
541
542 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
543}
544
468sub emit { 545sub emit {
469 my ($self, $signal, @args) = @_; 546 my ($self, $signal, @args) = @_;
470 547
471 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) = @_;
472} 554}
473 555
474sub DESTROY { 556sub DESTROY {
475 my ($self) = @_; 557 my ($self) = @_;
476 558
… …
589 delete $child->{parent}; 671 delete $child->{parent};
590 $child->hide; 672 $child->hide;
591 673
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 675
594 $self->check_size; 676 $self->check_size (1);
595 $self->update; 677 $self->update;
596} 678}
597 679
598sub clear { 680sub clear {
599 my ($self) = @_; 681 my ($self) = @_;
… …
739 821
740package CFClient::UI::ViewPort; 822package CFClient::UI::ViewPort;
741 823
742our @ISA = CFClient::UI::Window::; 824our @ISA = CFClient::UI::Window::;
743 825
826sub new {
827 my $class = shift;
828
829 $class->SUPER::new (
830 scroll_x => 0,
831 scroll_y => 1,
832 @_,
833 )
834}
835
744sub size_request { 836sub size_request {
745 my ($self) = @_; 837 my ($self) = @_;
746 838
747 @$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)};
748 840
749 @$self{qw(child_w child_h)} 841 $w = 10 if $self->{scroll_x};
842 $h = 10 if $self->{scroll_y};
843
844 ($w, $h)
750} 845}
751 846
752sub size_allocate { 847sub size_allocate {
753 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
754 849
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 850 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756# $w = $self->{w}; 851 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
852
757 $self->child->configure (0, 0, $cw, $ch); 853 $self->child->configure (0, 0, $w, $h);
758 $self->update; 854 $self->update;
759} 855}
760 856
761sub set_offset { 857sub set_offset {
762 my ($self, $x, $y) = @_; 858 my ($self, $x, $y) = @_;
… …
813 my $class = shift; 909 my $class = shift;
814 910
815 my $self; 911 my $self;
816 912
817 my $slider = new CFClient::UI::Slider 913 my $slider = new CFClient::UI::Slider
818 vertical => 1, 914 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 915 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 916 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1]); 917 $self->{vp}->set_offset (0, $_[1]);
822 }, 918 },
823 ; 919 ;
824 920
825 $self = $class->SUPER::new ( 921 $self = $class->SUPER::new (
… …
831 $self->{vp}->add ($self->{scrolled}); 927 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 928 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 929 $self->add ($self->{slider});
834 930
835 $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]);
836} 942}
837 943
838sub size_allocate { 944sub size_allocate {
839 my ($self, $w, $h) = @_; 945 my ($self, $w, $h) = @_;
840 946
… …
900 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);
901 1007
902sub new { 1008sub new {
903 my $class = shift; 1009 my $class = shift;
904 1010
905 # TODO: user_x, user_y, overwrite moveto?
906
907 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
908 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
909 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
910 border => 0.6, 1014 border => 0.6,
911 toplevel => 1, 1015 is_toplevel => 1,
912 can_events => 1, 1016 can_events => 1,
913 @_ 1017 @_
914 ); 1018 );
915 1019
916 $self->{title} &&= new CFClient::UI::Label 1020 $self->{title} &&= new CFClient::UI::Label
917 align => 0, 1021 align => 0,
… …
970 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
971 1075
972 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
973 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
974 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
975 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
976 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
977 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
978 $self->check_size; 1084 $self->check_size;
979 }; 1085 };
980 1086
981 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
982 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
985 $self->{motion} = sub { 1091 $self->{motion} = sub {
986 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
987 1093
988 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
989 1095
990 $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});
991 $self->update; 1100 $self->update;
992 }; 1101 };
993 } 1102 }
994} 1103}
995 1104
… …
1057sub new { 1166sub new {
1058 my $class = shift; 1167 my $class = shift;
1059 1168
1060 $class->SUPER::new ( 1169 $class->SUPER::new (
1061 col_expand => [], 1170 col_expand => [],
1062 @_ 1171 @_,
1063 ) 1172 )
1173}
1174
1175sub children {
1176 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1064} 1177}
1065 1178
1066sub add { 1179sub add {
1067 my ($self, $x, $y, $child) = @_; 1180 my ($self, $x, $y, $child) = @_;
1068 1181
1069 $child->set_parent ($self); 1182 $child->set_parent ($self);
1070 $self->{children}[$y][$x] = $child; 1183 $self->{children}[$y][$x] = $child;
1071 1184
1072 $child->check_size; 1185 $self->check_size (1);
1073} 1186}
1074 1187
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
1079# 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?
1080sub clear { 1189sub clear {
1081 my ($self) = @_; 1190 my ($self) = @_;
1082 1191
1083 my @children = $self->children; 1192 my @children = $self->children;
1084 delete $self->{children}; 1193 delete $self->{children};
… …
1086 for (@children) { 1195 for (@children) {
1087 delete $_->{parent}; 1196 delete $_->{parent};
1088 $_->hide; 1197 $_->hide;
1089 } 1198 }
1090 1199
1200 $self->check_size (1);
1091 $self->update; 1201 $self->update;
1092} 1202}
1093 1203
1094sub get_wh { 1204sub get_wh {
1095 my ($self) = @_; 1205 my ($self) = @_;
… …
1127sub size_allocate { 1237sub size_allocate {
1128 my ($self, $w, $h) = @_; 1238 my ($self, $w, $h) = @_;
1129 1239
1130 my ($ws, $hs) = $self->get_wh; 1240 my ($ws, $hs) = $self->get_wh;
1131 1241
1132 my $req_w = sum @$ws; 1242 my $req_w = (sum @$ws) || 1;
1133 my $req_h = sum @$hs; 1243 my $req_h = (sum @$hs) || 1;
1134 1244
1135 # TODO: nicer code && do row_expand 1245 # TODO: nicer code && do row_expand
1136 my @col_expand = @{$self->{col_expand}}; 1246 my @col_expand = @{$self->{col_expand}};
1137 @col_expand = (1) x @$ws unless @col_expand; 1247 @col_expand = (1) x @$ws unless @col_expand;
1138 my $col_expand = (sum @col_expand) || 1; 1248 my $col_expand = (sum @col_expand) || 1;
… …
1192 } 1302 }
1193} 1303}
1194 1304
1195############################################################################# 1305#############################################################################
1196 1306
1197package CFClient::UI::HBox; 1307package CFClient::UI::Box;
1198
1199# TODO: wrap into common Box base class
1200 1308
1201our @ISA = CFClient::UI::Container::; 1309our @ISA = CFClient::UI::Container::;
1202 1310
1203sub size_request { 1311sub size_request {
1204 my ($self) = @_; 1312 my ($self) = @_;
1205 1313
1206 my @alloc = map [$_->size_request], @{$self->{children}}; 1314 $self->{vertical}
1207 1315 ? (
1208 ( 1316 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1209 (List::Util::sum map $_->[0], @alloc), 1317 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1210 (List::Util::max map $_->[1], @alloc), 1318 )
1211 ) 1319 : (
1320 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1321 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1322 )
1212} 1323}
1213 1324
1214sub size_allocate { 1325sub size_allocate {
1215 my ($self, $w, $h) = @_; 1326 my ($self, $w, $h) = @_;
1216 1327
1217 ($h, $w) = ($w, $h); 1328 my $space = $self->{vertical} ? $h : $w;
1218
1219 my $children = $self->{children}; 1329 my $children = $self->{children};
1220 1330
1221 my @h = map $_->{req_w}, @$children; 1331 my @req;
1222 1332
1223 my $req_h = List::Util::sum @h; 1333 if ($self->{homogeneous}) {
1224 1334 @req = ($space / (@$children || 1)) x @$children;
1225 if ($req_h > $h) {
1226 # ah well, not enough space
1227 $_ *= $h / $req_h for @h;
1228 } 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 {
1229 my $exp = List::Util::sum map $_->{expand}, @$children; 1343 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1230 $exp ||= 1;
1231 1344
1345 $space = ($space - $req) / $expand; # remaining space to give away
1346
1347 $req[$_] += $space * $children->[$_]{expand}
1232 for (0 .. $#$children) { 1348 for 0 .. $#$children;
1233 my $child = $children->[$_];
1234
1235 my $alloc_h = $h[$_];
1236 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1237 $h[$_] = $alloc_h;
1238 } 1349 }
1239 } 1350 }
1240 1351
1241 CFClient::UI::harmonize \@h; 1352 CFClient::UI::harmonize \@req;
1242 1353
1243 my $y = 0; 1354 my $pos = 0;
1244 for (0 .. $#$children) { 1355 for (0 .. $#$children) {
1245 my $child = $children->[$_];
1246 my $h = $h[$_]; 1356 my $alloc = $req[$_];
1247 $child->configure ($y, 0, $h, $w); 1357 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1248 1358
1249 $y += $h; 1359 $pos += $alloc;
1250 } 1360 }
1251 1361
1252 1 1362 1
1253} 1363}
1254 1364
1255############################################################################# 1365#############################################################################
1256 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
1257package CFClient::UI::VBox; 1382package CFClient::UI::VBox;
1258 1383
1259# TODO: wrap into common Box base class
1260
1261our @ISA = CFClient::UI::Container::; 1384our @ISA = CFClient::UI::Box::;
1262 1385
1263sub size_request { 1386sub new {
1264 my ($self) = @_; 1387 my $class = shift;
1265 1388
1266 my @alloc = map [$_->size_request], @{$self->{children}}; 1389 $class->SUPER::new (
1267 1390 vertical => 1,
1268 ( 1391 @_,
1269 (List::Util::max map $_->[0], @alloc),
1270 (List::Util::sum map $_->[1], @alloc),
1271 ) 1392 )
1272}
1273
1274sub size_allocate {
1275 my ($self, $w, $h) = @_;
1276
1277 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1278
1279 my $children = $self->{children};
1280
1281 my @h = map $_->{req_h}, @$children;
1282
1283 my $req_h = List::Util::sum @h;
1284
1285 if ($req_h > $h) {
1286 # ah well, not enough space
1287 $_ *= $h / $req_h for @h;
1288 } else {
1289 my $exp = List::Util::sum map $_->{expand}, @$children;
1290 $exp ||= 1;
1291
1292 for (0 .. $#$children) {
1293 my $child = $children->[$_];
1294
1295 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1296 }
1297 }
1298
1299 CFClient::UI::harmonize \@h;
1300
1301 my $y = 0;
1302 for (0 .. $#$children) {
1303 my $child = $children->[$_];
1304 my $h = $h[$_];
1305 $child->configure (0, $y, $w, $h);
1306
1307 $y += $h;
1308 }
1309
1310 1
1311} 1393}
1312 1394
1313############################################################################# 1395#############################################################################
1314 1396
1315package CFClient::UI::Label; 1397package CFClient::UI::Label;
… …
1519 $self->{text} = $text; 1601 $self->{text} = $text;
1520 1602
1521 $text =~ s/./*/g if $self->{hidden}; 1603 $text =~ s/./*/g if $self->{hidden};
1522 $self->{layout}->set_text ("$text "); 1604 $self->{layout}->set_text ("$text ");
1523 1605
1524 $self->emit (changed => $self->{text}); 1606 $self->_emit (changed => $self->{text});
1525} 1607}
1526 1608
1527sub set_text { 1609sub set_text {
1528 my ($self, $text) = @_; 1610 my ($self, $text) = @_;
1529 1611
… …
1541 my ($self) = @_; 1623 my ($self) = @_;
1542 1624
1543 my ($w, $h) = $self->SUPER::size_request; 1625 my ($w, $h) = $self->SUPER::size_request;
1544 1626
1545 ($w + 1, $h) # add 1 for cursor 1627 ($w + 1, $h) # add 1 for cursor
1546}
1547
1548sub size_allocate {
1549 my ($self, $w, $h) = @_;
1550
1551 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1552} 1628}
1553 1629
1554sub key_down { 1630sub key_down {
1555 my ($self, $ev) = @_; 1631 my ($self, $ev) = @_;
1556 1632
… …
1571 } elsif ($sym == CFClient::SDLK_HOME) { 1647 } elsif ($sym == CFClient::SDLK_HOME) {
1572 $self->{cursor} = 0; 1648 $self->{cursor} = 0;
1573 } elsif ($sym == CFClient::SDLK_END) { 1649 } elsif ($sym == CFClient::SDLK_END) {
1574 $self->{cursor} = length $text; 1650 $self->{cursor} = length $text;
1575 } elsif ($uni == 27) { 1651 } elsif ($uni == 27) {
1576 $self->emit ('escape'); 1652 $self->_emit ('escape');
1577 } elsif ($uni) { 1653 } elsif ($uni) {
1578 substr $text, $self->{cursor}++, 0, chr $uni; 1654 substr $text, $self->{cursor}++, 0, chr $uni;
1579 } 1655 }
1580 1656
1581 $self->_set_text ($text); 1657 $self->_set_text ($text);
… …
1668 if ($sym == 13) { 1744 if ($sym == 13) {
1669 unshift @{$self->{history}}, 1745 unshift @{$self->{history}},
1670 my $txt = $self->get_text; 1746 my $txt = $self->get_text;
1671 $self->{history_pointer} = -1; 1747 $self->{history_pointer} = -1;
1672 $self->{history_saveback} = ''; 1748 $self->{history_saveback} = '';
1673 $self->emit (activate => $txt); 1749 $self->_emit (activate => $txt);
1674 $self->update; 1750 $self->update;
1675 1751
1676 } elsif ($sym == CFClient::SDLK_UP) { 1752 } elsif ($sym == CFClient::SDLK_UP) {
1677 if ($self->{history_pointer} < 0) { 1753 if ($self->{history_pointer} < 0) {
1678 $self->{history_saveback} = $self->get_text; 1754 $self->{history_saveback} = $self->get_text;
… …
1726 can_events => 1, 1802 can_events => 1,
1727 @_ 1803 @_
1728 ) 1804 )
1729} 1805}
1730 1806
1807sub activate { }
1808
1731sub button_up { 1809sub button_up {
1732 my ($self, $ev, $x, $y) = @_; 1810 my ($self, $ev, $x, $y) = @_;
1733 1811
1812 $self->emit ("activate")
1734 if ($x >= 0 && $x < $self->{w} 1813 if $x >= 0 && $x < $self->{w}
1735 && $y >= 0 && $y < $self->{h}) { 1814 && $y >= 0 && $y < $self->{h};
1736 $self->emit ("activate");
1737 }
1738} 1815}
1739 1816
1740sub _draw { 1817sub _draw {
1741 my ($self) = @_; 1818 my ($self) = @_;
1742 1819
… …
1794 my ($self, $ev, $x, $y) = @_; 1871 my ($self, $ev, $x, $y) = @_;
1795 1872
1796 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1797 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1798 $self->{state} = !$self->{state}; 1875 $self->{state} = !$self->{state};
1799 $self->emit (changed => $self->{state}); 1876 $self->_emit (changed => $self->{state});
1800 } 1877 }
1801} 1878}
1802 1879
1803sub _draw { 1880sub _draw {
1804 my ($self) = @_; 1881 my ($self) = @_;
… …
2097} 2174}
2098 2175
2099sub set_range { 2176sub set_range {
2100 my ($self, $range) = @_; 2177 my ($self, $range) = @_;
2101 2178
2102 $self->{range} = $range; 2179 ($range, $self->{range}) = ($self->{range}, $range);
2103 2180
2104 $self->update; 2181 $self->update
2182 if "@$range" ne "@{$self->{range}}";
2105} 2183}
2106 2184
2107sub set_value { 2185sub set_value {
2108 my ($self, $value) = @_; 2186 my ($self, $value) = @_;
2109 2187
… …
2120 if $unit; 2198 if $unit;
2121 2199
2122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2200 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2123 2201
2124 if ($value != $old_value) { 2202 if ($value != $old_value) {
2125 $self->emit (changed => $value); 2203 $self->_emit (changed => $value);
2126 $self->update; 2204 $self->update;
2127 } 2205 }
2128} 2206}
2129 2207
2130sub size_request { 2208sub size_request {
… …
2492 2570
2493sub new { 2571sub new {
2494 my $class = shift; 2572 my $class = shift;
2495 2573
2496 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2497 state => 0, 2575 state => 0,
2498 connect_activate => \&toggle_flopper, 2576 on_activate => \&toggle_flopper,
2499 @_ 2577 @_
2500 ); 2578 );
2501 2579
2502 if ($self->{state}) {
2503 $self->{state} = 0;
2504 $self->toggle_flopper;
2505 }
2506
2507 $self 2580 $self
2508} 2581}
2509 2582
2510sub toggle_flopper { 2583sub toggle_flopper {
2511 my ($self) = @_; 2584 my ($self) = @_;
2512 2585
2513 # TODO: use animation 2586 $self->{other}->toggle_visibility;
2514 if ($self->{state} = !$self->{state}) {
2515 $CFClient::UI::ROOT->add ($self->{other});
2516 $self->{other}->move ($self->coord2global (0, $self->{h}));
2517 $self->emit ("open");
2518 } else {
2519 $CFClient::UI::ROOT->remove ($self->{other});
2520 $self->emit ("close");
2521 }
2522
2523 $self->emit (changed => $self->{state});
2524} 2587}
2525 2588
2526############################################################################# 2589#############################################################################
2527 2590
2528package CFClient::UI::Tooltip; 2591package CFClient::UI::Tooltip;
… …
2604 2667
2605sub new { 2668sub new {
2606 my $class = shift; 2669 my $class = shift;
2607 2670
2608 my $self = $class->SUPER::new ( 2671 my $self = $class->SUPER::new (
2609 aspect => 1, 2672 aspect => 1,
2673 can_events => 0,
2610 @_, 2674 @_,
2611 ); 2675 );
2612 2676
2613 if ($self->{anim} && $self->{animspeed}) { 2677 if ($self->{anim} && $self->{animspeed}) {
2614 Scalar::Util::weaken (my $widget = $self); 2678 Scalar::Util::weaken (my $widget = $self);
… …
2673 $self->SUPER::DESTROY; 2737 $self->SUPER::DESTROY;
2674} 2738}
2675 2739
2676############################################################################# 2740#############################################################################
2677 2741
2678package CFClient::UI::InventoryItem; 2742package CFClient::UI::Inventory;
2679 2743
2680our @ISA = CFClient::UI::HBox::; 2744our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub _item_to_desc {
2683 my ($item) = @_;
2684
2685 my $desc =
2686 $item->{nrof} < 2
2687 ? $item->{name}
2688 : "$item->{nrof} × $item->{name_pl}";
2689
2690 $item->{flags} & Crossfire::Protocol::F_OPEN
2691 and $desc .= " (open)";
2692 $item->{flags} & Crossfire::Protocol::F_APPLIED
2693 and $desc .= " (applied)";
2694 $item->{flags} & Crossfire::Protocol::F_UNPAID
2695 and $desc .= " (unpaid)";
2696 $item->{flags} & Crossfire::Protocol::F_MAGIC
2697 and $desc .= " (magic)";
2698 $item->{flags} & Crossfire::Protocol::F_CURSED
2699 and $desc .= " (cursed)";
2700 $item->{flags} & Crossfire::Protocol::F_DAMNED
2701 and $desc .= " (damned)";
2702 $item->{flags} & Crossfire::Protocol::F_LOCKED
2703 and $desc .= " *";
2704
2705 $desc
2706}
2707 2745
2708sub new { 2746sub new {
2709 my $class = shift; 2747 my $class = shift;
2710 2748
2711 my %args = @_;
2712
2713 my $item = delete $args{item};
2714
2715 my $desc = _item_to_desc ($item);
2716
2717 my $self = $class->SUPER::new ( 2749 my $self = $class->SUPER::new (
2718 can_hover => 1,
2719 can_events => 1,
2720 tooltip => ((CFClient::UI::Label::escape $desc)
2721 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2722 connect_button_down => sub {
2723 my ($self, $ev, $x, $y) = @_;
2724
2725 # todo: maybe put examine on 1? but should just be a tooltip :(
2726 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2727 my $targ = $::CONN->{player}{tag};
2728
2729 if ($item->{container} == $::CONN->{player}{tag}) {
2730 $targ = $main::OPENCONT;
2731 }
2732
2733 $::CONN->send ("move $targ $item->{tag} 0");
2734 } elsif ($ev->{button} == 1) {
2735 $::CONN->send ("examine $item->{tag}");
2736 } elsif ($ev->{button} == 2) {
2737 $::CONN->send ("apply $item->{tag}");
2738 } elsif ($ev->{button} == 3) {
2739 my @menu_items = (
2740 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2741 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2742 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2743 (
2744 $item->{flags} & Crossfire::Protocol::F_LOCKED
2745 ? (
2746 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2747 )
2748 : (
2749 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2750 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2751 )
2752 ),
2753 );
2754
2755 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2756 }
2757
2758 1
2759 },
2760 %args
2761 );
2762
2763
2764 $self->add (new CFClient::UI::Face
2765 can_events => 0,
2766 face => $item->{face},
2767 anim => $item->{anim},
2768 animspeed => $item->{animspeed},
2769 );
2770
2771 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2772
2773 $self->{item} = $item;
2774
2775 $self->update_item;
2776
2777 $self
2778}
2779
2780sub update_item {
2781 my ($self) = @_;
2782
2783 my $desc = _item_to_desc ($self->{item});
2784
2785 $self->{name_lbl}->set_text ($desc);
2786}
2787
2788#############################################################################
2789
2790package CFClient::UI::Inventory;
2791
2792our @ISA = CFClient::UI::ScrolledWindow::;
2793
2794sub new {
2795 my $class = shift;
2796
2797 my $self = $class->SUPER::new (
2798 scrolled => (new CFClient::UI::Table), 2750 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2799 @_, 2751 @_,
2800 ); 2752 );
2801 2753
2802 $self 2754 $self
2803} 2755}
… …
2813 or ($a->{name} cmp $b->{name}) 2765 or ($a->{name} cmp $b->{name})
2814 } @$items; 2766 } @$items;
2815 2767
2816 $self->{real_items} = \@items; 2768 $self->{real_items} = \@items;
2817 2769
2770 my $row = 0;
2818 for my $item (@items) { 2771 for my $item (@items) {
2819 $item->{item} = $item; 2772 CFClient::Item::update_widgets $item;
2820 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2821 $item->update_item ();
2822 }
2823 2773
2824 my $i = 0; 2774 $self->{scrolled}->add (0, $row, $item->{face_widget});
2825 for (@items) { 2775 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2826 $self->{scrolled}->add (0, $i, $_); 2776 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2827 my $nrof = $_->{item}->{nrof} || 1;
2828 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2829 }
2830 2777
2831# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2778 $row++;
2832} 2779 }
2833
2834sub size_request {
2835 my ($self) = @_;
2836 ($self->{req_w}, $self->{req_h});
2837} 2780}
2838 2781
2839############################################################################# 2782#############################################################################
2840 2783
2841package CFClient::UI::Menu; 2784package CFClient::UI::Menu;
… …
2876 2819
2877# 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)
2878sub popup { 2821sub popup {
2879 my ($self, $ev) = @_; 2822 my ($self, $ev) = @_;
2880 2823
2881 $self->emit ("popdown"); 2824 $self->_emit ("popdown");
2882 2825
2883 # maybe save $GRAB? must be careful about events... 2826 # maybe save $GRAB? must be careful about events...
2884 $GRAB = $self; 2827 $GRAB = $self;
2885 $self->{button} = $ev->{button}; 2828 $self->{button} = $ev->{button};
2886 2829
… …
2901 2844
2902 if ($ev->{button} == $self->{button}) { 2845 if ($ev->{button} == $self->{button}) {
2903 undef $GRAB; 2846 undef $GRAB;
2904 $self->hide; 2847 $self->hide;
2905 2848
2906 $self->emit ("popdown"); 2849 $self->_emit ("popdown");
2907 $self->{hover}[1]->() if $self->{hover}; 2850 $self->{hover}[1]->() if $self->{hover};
2908 } 2851 }
2909} 2852}
2910 2853
2911############################################################################# 2854#############################################################################
… …
2973sub add { 2916sub add {
2974 my ($self, $text, %arg) = @_; 2917 my ($self, $text, %arg) = @_;
2975 2918
2976 $text =~ s/^\s+//; 2919 $text =~ s/^\s+//;
2977 $text =~ s/\s+$//; 2920 $text =~ s/\s+$//;
2921
2922 return unless $text;
2978 2923
2979 my $timeout = time + ((delete $arg{timeout}) || 60); 2924 my $timeout = time + ((delete $arg{timeout}) || 60);
2980 2925
2981 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2926 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2982 2927
… …
3026 2971
3027sub new { 2972sub new {
3028 my $class = shift; 2973 my $class = shift;
3029 2974
3030 $class->SUPER::new ( 2975 $class->SUPER::new (
2976 visible => 1,
3031 @_, 2977 @_,
3032 ) 2978 )
3033} 2979}
3034 2980
3035sub configure { 2981sub configure {
… …
3053} 2999}
3054 3000
3055sub size_allocate { 3001sub size_allocate {
3056 my ($self, $w, $h) = @_; 3002 my ($self, $w, $h) = @_;
3057 3003
3058 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3059 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3060
3061 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3062 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3063
3064 for my $child ($self->children) { 3004 for my $child ($self->children) {
3065 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3005 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3066 3006
3067 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3007 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3068 if exists $child->{req_x}; 3008 if exists $child->{req_x};
3069 3009
3070 $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
3071 if exists $child->{req_y}; 3011 if exists $child->{req_y};
3072 3012
3013 delete @$child{qw(req_x req_y)};
3014
3073 $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;
3074 $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;
3075 3017
3076 $child->configure ($X, $Y, $W, $H); 3018 $child->configure ($X, $Y, $W, $H);
3077 } 3019 }
… …
3097} 3039}
3098 3040
3099sub add { 3041sub add {
3100 my ($self, @children) = @_; 3042 my ($self, @children) = @_;
3101 3043
3102 for (my @widgets = @children; my $w = pop @widgets; ) {
3103 push @widgets, $w->children;
3104 $w->{root} = $self;
3105 $w->{visible} = 1;
3106 }
3107
3108 for my $child (@children) { 3044 for my $child (@children) {
3109 $child->{toplevel} = 1; 3045 $child->{is_toplevel} = 1;
3110 3046
3111 # integerise window positions 3047 # integerise window positions
3112 $child->{x} = int $child->{x}; 3048 $child->{x} = int $child->{x};
3113 $child->{y} = int $child->{y}; 3049 $child->{y} = int $child->{y};
3114 } 3050 }
3115 3051
3116 $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
3117} 3059}
3118 3060
3119sub remove { 3061sub remove {
3120 my ($self, @children) = @_; 3062 my ($self, @children) = @_;
3121 3063
3122 $self->SUPER::remove (@children); 3064 $self->SUPER::remove (@children);
3123 3065
3124 while (@children) { 3066 while (@children) {
3125 my $w = pop @children; 3067 my $w = pop @children;
3126 push @children, $w->children; 3068 push @children, $w->children;
3127 delete $w->{visible}; 3069 $w->set_invisible;
3128 } 3070 }
3129} 3071}
3130 3072
3131sub on_refresh { 3073sub on_refresh {
3132 my ($self, $id, $cb) = @_; 3074 my ($self, $id, $cb) = @_;
… …
3147 $_->() 3089 $_->()
3148 for values %{delete $self->{refresh_hook}}; 3090 for values %{delete $self->{refresh_hook}};
3149 } 3091 }
3150 3092
3151 if ($self->{check_size}) { 3093 if ($self->{check_size}) {
3152 my @queue = ([], []); 3094 my @queue;
3153 3095
3154 for (;;) { 3096 for (;;) {
3155 if ($self->{check_size}) { 3097 if ($self->{check_size}) {
3156 # heuristic: check containers last 3098 #TODO use array-of-depth approach
3157 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3099
3100 @queue = sort { $a->{visible} <=> $b->{visible} }
3158 for values %{delete $self->{check_size}} 3101 @queue, values %{delete $self->{check_size}};
3159 } 3102 }
3160 3103
3161 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3104 my $widget = pop @queue || last;
3162 3105
3106 defined $widget->{visible} or last; # do not resize invisible widgets
3107
3163 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3164 ? @$widget{qw(user_w user_h)} 3109 ? @$widget{qw(def_w def_h)}
3165 : $widget->size_request; 3110 : $widget->size_request;
3166 3111
3167 if (delete $widget->{force_alloc} 3112 if (delete $widget->{force_alloc}
3168 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3113 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3169 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#
… …
3178 } 3123 }
3179 } 3124 }
3180 } 3125 }
3181 3126
3182 while ($self->{size_alloc}) { 3127 while ($self->{size_alloc}) {
3128 for (
3129 sort { $a->[0]{visible} <=> $b->[0]{visible} }
3183 for (values %{delete $self->{size_alloc}}) { 3130 values %{delete $self->{size_alloc}}
3131 ) {
3184 my ($widget, $w, $h) = @$_; 3132 my ($widget, $w, $h) = @$_;
3185 3133
3186 $w = 0 if $w < 0; 3134 $w = 0 if $w < 0;
3187 $h = 0 if $h < 0; 3135 $h = 0 if $h < 0;
3188 3136
3189 $widget->{w} = $w; 3137 $widget->{w} = $w;
3190 $widget->{h} = $h; 3138 $widget->{h} = $h;
3191 $widget->size_allocate ($w, $h);
3192 $widget->emit (size_allocate => $w, $h); 3139 $widget->emit (size_allocate => $w, $h);
3193 } 3140 }
3194 } 3141 }
3195 3142
3196 while ($self->{post_alloc_hook}) { 3143 while ($self->{post_alloc_hook}) {

Diff Legend

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