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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.251 by root, Sun May 28 22:24:24 2006 UTC

… …
55 55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0) 56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH; 57 if $x + $TOOLTIP->{w} > $::WIDTH;
58 58
59 $TOOLTIP->move ($x, $y); 59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update; 60 $TOOLTIP->realloc;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
… …
175 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 176 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 177 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 178 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 179 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 180 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 181 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
185 } 182 }
186 } 183 }
187 184
188 reconfigure_widgets; 185 reconfigure_widgets;
189} 186}
… …
214 } 211 }
215 212
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 213 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217 214
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 215 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 216 $self->{req_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 217 $self->{req_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 218 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 219 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 } 220 }
224 221
225 $self 222 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
236} 223}
237 224
238sub destroy { 225sub destroy {
239 my ($self) = @_; 226 my ($self) = @_;
240 227
… …
242 %$self = (); 229 %$self = ();
243} 230}
244 231
245sub show { 232sub show {
246 my ($self) = @_; 233 my ($self) = @_;
234
247 return if $self->{parent}; 235 return if $self->{parent};
248 236
249 $CFClient::UI::ROOT->add ($self); 237 $CFClient::UI::ROOT->add ($self);
250} 238}
251 239
252sub show_centered { 240sub center {
253 my ($self) = @_; 241 my ($self) = @_;
254 return if $self->{parent};
255
256 $self->show;
257 242
258 $CFClient::UI::ROOT->on_post_alloc ( 243 $CFClient::UI::ROOT->on_post_alloc (
259 "centered $self" => sub { 244 "center_$self" => sub {
260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 245 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
261 }, 246 },
262 ); 247 );
248
249 $self->update;
250}
251
252sub set_visible {
253 my ($self) = @_;
254
255 return if $self->{visible};
256
257 $self->{root} = $self->{parent}{root};
258 $self->{visible} = $self->{parent}{visible} + 1;
259
260 $self->emit (visibility_change => 1);
261
262 $self->realloc unless exists $self->{req_w};
263
264 $_->set_visible for $self->children;
263} 265}
264 266
265sub set_invisible { 267sub set_invisible {
266 my ($self) = @_; 268 my ($self) = @_;
267 269
268 return unless $self->{visible}; 270 return unless $self->{visible};
269 271
270 # broken show/hide model 272 $_->set_invisible for $self->children;
271 273
272 delete $self->{root}; 274 delete $self->{root};
273 delete $self->{visible}; 275 delete $self->{visible};
274 276
275 undef $GRAB if $GRAB == $self; 277 undef $GRAB if $GRAB == $self;
276 undef $HOVER if $HOVER == $self; 278 undef $HOVER if $HOVER == $self;
277 279
278 CFClient::UI::check_tooltip 280 CFClient::UI::check_tooltip
279 if $CFClient::UI::TOOLTIP->{owner} == $self; 281 if $TOOLTIP->{owner} == $self;
280 282
281 $self->focus_out; 283 $self->focus_out;
282 284
283 $self->emit (visibility_change => 0); 285 $self->emit (visibility_change => 0);
286}
287
288sub set_visibility {
289 my ($self, $visible) = @_;
290
291 return if $self->{visible} == $visible;
292
293 $visible ? $self->hide
294 : $self->show;
295}
296
297sub toggle_visibility {
298 my ($self) = @_;
299
300 $self->{visible}
301 ? $self->hide
302 : $self->show;
284} 303}
285 304
286sub hide { 305sub hide {
287 my ($self) = @_; 306 my ($self) = @_;
288 307
… …
303} 322}
304 323
305sub set_size { 324sub set_size {
306 my ($self, $w, $h) = @_; 325 my ($self, $w, $h) = @_;
307 326
308 $self->{user_w} = $w; 327 $self->{def_w} = $w;
309 $self->{user_h} = $h; 328 $self->{def_h} = $h;
310 329
311 $self->check_size; 330 $self->realloc;
312} 331}
313 332
314sub size_request { 333sub size_request {
315 require Carp; 334 require Carp;
316 Carp::confess "size_request is abstract"; 335 Carp::confess "size_request is abstract";
… …
336 $self->{y} = $y; 355 $self->{y} = $y;
337 $self->update; 356 $self->update;
338 } 357 }
339 358
340 if ($self->{w} != $w || $self->{h} != $h) { 359 if ($self->{w} != $w || $self->{h} != $h) {
360 return unless $self->{visible};
361
341 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
342 } 363 }
343} 364}
344 365
345sub size_allocate { 366sub size_allocate {
346 # nothing to be done 367 # nothing to be done
347}
348
349sub reconfigure {
350 my ($self) = @_;
351
352 $self->check_size (1);
353 $self->update;
354} 368}
355 369
356sub children { 370sub children {
357} 371}
358 372
… …
436sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
437sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
438sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
439sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
440sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 454sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
455
456sub find_widget {
457 my ($self, $x, $y) = @_;
458
459 return () unless $self->{can_events};
460
461 return $self
462 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
463 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
464
465 ()
466}
467
468sub set_parent {
469 my ($self, $parent) = @_;
470
471 Scalar::Util::weaken ($self->{parent} = $parent);
472
473 $self->set_visible if $parent->{visible};
474
475 $self->realloc;
476}
477
478sub connect {
479 my ($self, $signal, $cb) = @_;
480
481 push @{ $self->{signal_cb}{$signal} }, $cb;
482}
483
484sub _emit {
485 my ($self, $signal, @args) = @_;
486
487 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
488}
489
490sub emit {
491 my ($self, $signal, @args) = @_;
492
493 $self->_emit ($signal, @args)
494 || $self->$signal (@args);
495}
496
497sub visibility_change {
498 #my ($self, $visible) = @_;
499}
500
501sub realloc {
502 my ($self) = @_;
503
504 return unless $self->{visible};
505
506 return if $self->{root}{realloc}{$self};
507
508 $self->{root}{realloc}{$self} = $self;
509 $self->{root}->update;
510}
511
512sub update {
513 my ($self) = @_;
514
515 $self->{parent}->update
516 if $self->{parent};
517}
441 518
442sub draw { 519sub draw {
443 my ($self) = @_; 520 my ($self) = @_;
444 521
445 return unless $self->{h} && $self->{w}; 522 return unless $self->{h} && $self->{w};
… …
483 my ($self) = @_; 560 my ($self) = @_;
484 561
485 warn "no draw defined for $self\n"; 562 warn "no draw defined for $self\n";
486} 563}
487 564
488sub find_widget {
489 my ($self, $x, $y) = @_;
490
491 return () unless $self->{can_events};
492
493 return $self
494 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
495 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
496
497 ()
498}
499
500sub set_parent {
501 my ($self, $parent) = @_;
502
503 Scalar::Util::weaken ($self->{parent} = $parent);
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
513 # TODO: req_w _does_change after ->reconfigure
514 $self->check_size
515 unless exists $self->{req_w};
516
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555}
556
557sub DESTROY { 565sub DESTROY {
558 my ($self) = @_; 566 my ($self) = @_;
559 567
560 delete $WIDGET{$self+0}; 568 delete $WIDGET{$self+0};
561 #$self->deactivate; 569 #$self->deactivate;
… …
656 $self->{children} = [ 664 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 665 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 666 @{$self->{children}}, @widgets
659 ]; 667 ];
660 668
661 $self->check_size (1); 669 $self->realloc;
662 $self->update;
663} 670}
664 671
665sub children { 672sub children {
666 @{ $_[0]{children} } 673 @{ $_[0]{children} }
667} 674}
… …
672 delete $child->{parent}; 679 delete $child->{parent};
673 $child->hide; 680 $child->hide;
674 681
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 682 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 683
677 $self->check_size (1); 684 $self->realloc;
678 $self->update;
679} 685}
680 686
681sub clear { 687sub clear {
682 my ($self) = @_; 688 my ($self) = @_;
683 689
… …
687 for (@$children) { 693 for (@$children) {
688 delete $_->{parent}; 694 delete $_->{parent};
689 $_->hide; 695 $_->hide;
690 } 696 }
691 697
692 $self->check_size; 698 $self->realloc;
693 $self->update;
694} 699}
695 700
696sub find_widget { 701sub find_widget {
697 my ($self, $x, $y) = @_; 702 my ($self, $x, $y) = @_;
698 703
… …
751sub size_request { 756sub size_request {
752 $_[0]{children}[0]->size_request 757 $_[0]{children}[0]->size_request
753} 758}
754 759
755sub size_allocate { 760sub size_allocate {
756 my ($self, $w, $h) = @_; 761 my ($self, $w, $h, $changed) = @_;
757 762
758 $self->{children}[0]->configure (0, 0, $w, $h); 763 $self->{children}[0]->configure (0, 0, $w, $h);
759} 764}
760 765
761############################################################################# 766#############################################################################
… …
778 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 783 $ROOT->on_post_alloc ($self => sub { $self->render_child });
779 $self->SUPER::update; 784 $self->SUPER::update;
780} 785}
781 786
782sub size_allocate { 787sub size_allocate {
783 my ($self, $w, $h) = @_; 788 my ($self, $w, $h, $changed) = @_;
784 789
785 $self->SUPER::size_allocate ($w, $h); 790 $self->SUPER::size_allocate ($w, $h, $changed);
786 $self->update; 791 $self->update
792 if $changed;
787} 793}
788 794
789sub _render { 795sub _render {
790 $_[0]{children}[0]->draw; 796 $_[0]{children}[0]->draw;
791} 797}
… …
835} 841}
836 842
837sub size_request { 843sub size_request {
838 my ($self) = @_; 844 my ($self) = @_;
839 845
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
841 847
842 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
843} 852}
844 853
845sub size_allocate { 854sub size_allocate {
846 my ($self, $w, $h) = @_; 855 my ($self, $w, $h, $changed) = @_;
847 856
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850 859
851 $self->child->configure (0, 0, $w, $h); 860 $self->child->configure (0, 0, $w, $h);
… …
938 my $child = $self->{vp}->child; 947 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
940} 949}
941 950
942sub size_allocate { 951sub size_allocate {
943 my ($self, $w, $h) = @_; 952 my ($self, $w, $h, $changed) = @_;
944 953
945 $self->SUPER::size_allocate ($w, $h); 954 $self->SUPER::size_allocate ($w, $h, $changed);
946 955
947 my $child = $self->{vp}->child; 956 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 958}
950 959
… …
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005 1014
1006sub new { 1015sub new {
1007 my $class = shift; 1016 my $class = shift;
1008
1009 # TODO: user_x, user_y, overwrite moveto?
1010 1017
1011 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1021 border => 0.6,
… …
1040 $h + $self->border * 2, 1047 $h + $self->border * 2,
1041 ) 1048 )
1042} 1049}
1043 1050
1044sub size_allocate { 1051sub size_allocate {
1045 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h, $changed) = @_;
1053
1054 return unless $changed;
1046 1055
1047 $h -= List::Util::max 0, $self->border * 2; 1056 $h -= List::Util::max 0, $self->border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1057 $w -= List::Util::max 0, $self->border * 2;
1049 1058
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1059 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1076 my $dx = $ev->{x} - $ox; 1085 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1086 my $dy = $ev->{y} - $oy;
1078 1087
1079 $self->{user_x} = $wx + $dx * $mx; 1088 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my; 1089 $self->{user_y} = $wy + $dy * $my;
1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1092 $self->move ($self->{user_x}, $self->{user_y});
1084 $self->check_size; 1093 $self->realloc;
1085 }; 1094 };
1086 1095
1087 } elsif ($lr ^ $td) { 1096 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1097 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1098 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1093 1102
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1103 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1104
1096 $self->{user_x} = $bx + $x - $ox; 1105 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy; 1106 $self->{user_y} = $by + $y - $oy;
1107
1098 $self->move ($self->{user_x}, $self->{user_y}); 1108 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update; 1109 $self->realloc;
1100 }; 1110 };
1101 } 1111 }
1102} 1112}
1103 1113
1104sub button_up { 1114sub button_up {
… …
1179 my ($self, $x, $y, $child) = @_; 1189 my ($self, $x, $y, $child) = @_;
1180 1190
1181 $child->set_parent ($self); 1191 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1192 $self->{children}[$y][$x] = $child;
1183 1193
1184 $self->check_size (1); 1194 $self->realloc;
1185} 1195}
1186 1196
1187# TODO: move to container class maybe? send children a signal on removal? 1197# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1198sub clear {
1189 my ($self) = @_; 1199 my ($self) = @_;
… …
1194 for (@children) { 1204 for (@children) {
1195 delete $_->{parent}; 1205 delete $_->{parent};
1196 $_->hide; 1206 $_->hide;
1197 } 1207 }
1198 1208
1199 $self->check_size (1); 1209 $self->realloc;
1200 $self->update;
1201} 1210}
1202 1211
1203sub get_wh { 1212sub get_wh {
1204 my ($self) = @_; 1213 my ($self) = @_;
1205 1214
… …
1232 (sum @$hs), 1241 (sum @$hs),
1233 ) 1242 )
1234} 1243}
1235 1244
1236sub size_allocate { 1245sub size_allocate {
1237 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h, $changed) = @_;
1238 1247
1239 my ($ws, $hs) = $self->get_wh; 1248 my ($ws, $hs) = $self->get_wh;
1240 1249
1241 my $req_w = (sum @$ws) || 1; 1250 my $req_w = (sum @$ws) || 1;
1242 my $req_h = (sum @$hs) || 1; 1251 my $req_h = (sum @$hs) || 1;
… …
1301 } 1310 }
1302} 1311}
1303 1312
1304############################################################################# 1313#############################################################################
1305 1314
1315package CFClient::UI::Box;
1316
1317our @ISA = CFClient::UI::Container::;
1318
1319sub size_request {
1320 my ($self) = @_;
1321
1322 $self->{vertical}
1323 ? (
1324 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1325 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1326 )
1327 : (
1328 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1330 )
1331}
1332
1333sub size_allocate {
1334 my ($self, $w, $h, $changed) = @_;
1335
1336 my $space = $self->{vertical} ? $h : $w;
1337 my $children = $self->{children};
1338
1339 my @req;
1340
1341 if ($self->{homogeneous}) {
1342 @req = ($space / (@$children || 1)) x @$children;
1343 } else {
1344 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1345 my $req = List::Util::sum @req;
1346
1347 if ($req > $space) {
1348 # ah well, not enough space
1349 $_ *= $space / $req for @req;
1350 } else {
1351 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1352
1353 $space = ($space - $req) / $expand; # remaining space to give away
1354
1355 $req[$_] += $space * $children->[$_]{expand}
1356 for 0 .. $#$children;
1357 }
1358 }
1359
1360 CFClient::UI::harmonize \@req;
1361
1362 my $pos = 0;
1363 for (0 .. $#$children) {
1364 my $alloc = $req[$_];
1365 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1366
1367 $pos += $alloc;
1368 }
1369
1370 1
1371}
1372
1373#############################################################################
1374
1306package CFClient::UI::HBox; 1375package CFClient::UI::HBox;
1307 1376
1308# TODO: wrap into common Box base class
1309
1310our @ISA = CFClient::UI::Container::; 1377our @ISA = CFClient::UI::Box::;
1311 1378
1312sub size_request { 1379sub new {
1313 my ($self) = @_; 1380 my $class = shift;
1314 1381
1315 my @alloc = map [$_->size_request], @{$self->{children}}; 1382 $class->SUPER::new (
1316 1383 vertical => 0,
1317 ( 1384 @_,
1318 (List::Util::sum map $_->[0], @alloc),
1319 (List::Util::max map $_->[1], @alloc),
1320 ) 1385 )
1321} 1386}
1322 1387
1323sub size_allocate {
1324 my ($self, $w, $h) = @_;
1325
1326 ($h, $w) = ($w, $h);
1327
1328 my $children = $self->{children};
1329
1330 my @h = map $_->{req_w}, @$children;
1331
1332 my $req_h = List::Util::sum @h;
1333
1334 if ($req_h > $h) {
1335 # ah well, not enough space
1336 $_ *= $h / $req_h for @h;
1337 } else {
1338 my $exp = List::Util::sum map $_->{expand}, @$children;
1339 $exp ||= 1;
1340
1341 for (0 .. $#$children) {
1342 my $child = $children->[$_];
1343
1344 my $alloc_h = $h[$_];
1345 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1346 $h[$_] = $alloc_h;
1347 }
1348 }
1349
1350 CFClient::UI::harmonize \@h;
1351
1352 my $y = 0;
1353 for (0 .. $#$children) {
1354 my $child = $children->[$_];
1355 my $h = $h[$_];
1356 $child->configure ($y, 0, $h, $w);
1357
1358 $y += $h;
1359 }
1360
1361 1
1362}
1363
1364############################################################################# 1388#############################################################################
1365 1389
1366package CFClient::UI::VBox; 1390package CFClient::UI::VBox;
1367 1391
1368# TODO: wrap into common Box base class
1369
1370our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Box::;
1371 1393
1372sub size_request { 1394sub new {
1373 my ($self) = @_; 1395 my $class = shift;
1374 1396
1375 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $class->SUPER::new (
1376 1398 vertical => 1,
1377 ( 1399 @_,
1378 (List::Util::max map $_->[0], @alloc),
1379 (List::Util::sum map $_->[1], @alloc),
1380 ) 1400 )
1381}
1382
1383sub size_allocate {
1384 my ($self, $w, $h) = @_;
1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1388 my $children = $self->{children};
1389
1390 my @h = map $_->{req_h}, @$children;
1391
1392 my $req_h = List::Util::sum @h;
1393
1394 if ($req_h > $h) {
1395 # ah well, not enough space
1396 $_ *= $h / $req_h for @h;
1397 } else {
1398 my $exp = List::Util::sum map $_->{expand}, @$children;
1399 $exp ||= 1;
1400
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403
1404 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1405 }
1406 }
1407
1408 CFClient::UI::harmonize \@h;
1409
1410 my $y = 0;
1411 for (0 .. $#$children) {
1412 my $child = $children->[$_];
1413 my $h = $h[$_];
1414 $child->configure (0, $y, $w, $h);
1415
1416 $y += $h;
1417 }
1418
1419 1
1420} 1401}
1421 1402
1422############################################################################# 1403#############################################################################
1423 1404
1424package CFClient::UI::Label; 1405package CFClient::UI::Label;
… …
1487 $self->{text} = "T$text"; 1468 $self->{text} = "T$text";
1488 1469
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490 $self->{layout}->set_text ($text); 1471 $self->{layout}->set_text ($text);
1491 1472
1492 $self->update; 1473 $self->realloc;
1493 $self->check_size;
1494} 1474}
1495 1475
1496sub set_markup { 1476sub set_markup {
1497 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1498 1478
… …
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503 1483
1504 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1505 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1506 1486
1507 $self->update; 1487 $self->realloc;
1508 $self->check_size;
1509} 1488}
1510 1489
1511sub size_request { 1490sub size_request {
1512 my ($self) = @_; 1491 my ($self) = @_;
1513 1492
… …
1534 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1535 ) 1514 )
1536} 1515}
1537 1516
1538sub size_allocate { 1517sub size_allocate {
1539 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1540 1519
1541 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1542} 1522}
1543 1523
1544sub set_fontsize { 1524sub set_fontsize {
1545 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1546 1526
1547 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1548 delete $self->{texture}; 1528 delete $self->{texture};
1549 1529
1550 $self->update; 1530 $self->realloc;
1551 $self->check_size;
1552} 1531}
1553 1532
1554sub _draw { 1533sub _draw {
1555 my ($self) = @_; 1534 my ($self) = @_;
1556 1535
… …
1636sub set_text { 1615sub set_text {
1637 my ($self, $text) = @_; 1616 my ($self, $text) = @_;
1638 1617
1639 $self->{cursor} = length $text; 1618 $self->{cursor} = length $text;
1640 $self->_set_text ($text); 1619 $self->_set_text ($text);
1641 $self->update; 1620
1642 $self->check_size; 1621 $self->realloc;
1643} 1622}
1644 1623
1645sub get_text { 1624sub get_text {
1646 $_[0]{text} 1625 $_[0]{text}
1647} 1626}
… …
1680 } elsif ($uni) { 1659 } elsif ($uni) {
1681 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1682 } 1661 }
1683 1662
1684 $self->_set_text ($text); 1663 $self->_set_text ($text);
1685 $self->update; 1664
1686 $self->check_size; 1665 $self->realloc;
1687} 1666}
1688 1667
1689sub focus_in { 1668sub focus_in {
1690 my ($self) = @_; 1669 my ($self) = @_;
1691 1670
… …
2198 $self->update; 2177 $self->update;
2199 2178
2200 $self 2179 $self
2201} 2180}
2202 2181
2182sub changed { }
2183
2203sub set_range { 2184sub set_range {
2204 my ($self, $range) = @_; 2185 my ($self, $range) = @_;
2205 2186
2206 ($range, $self->{range}) = ($self->{range}, $range); 2187 ($range, $self->{range}) = ($self->{range}, $range);
2207 2188
… …
2396 $self->{fontsize} = $fontsize; 2377 $self->{fontsize} = $fontsize;
2397 $self->reflow; 2378 $self->reflow;
2398} 2379}
2399 2380
2400sub size_allocate { 2381sub size_allocate {
2401 my ($self, $w, $h) = @_; 2382 my ($self, $w, $h, $changed) = @_;
2402 2383
2403 $self->SUPER::size_allocate ($w, $h); 2384 $self->SUPER::size_allocate ($w, $h, $changed);
2385
2386 return unless $changed;
2404 2387
2405 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2388 $self->{layout}->set_font ($self->{font}) if $self->{font};
2406 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $self->{layout}->set_width ($self->{children}[0]{w}); 2390 $self->{layout}->set_width ($self->{children}[0]{w});
2408 2391
… …
2650 2633
2651 ($w + 4, $h + 4) 2634 ($w + 4, $h + 4)
2652} 2635}
2653 2636
2654sub size_allocate { 2637sub size_allocate {
2655 my ($self, $w, $h) = @_; 2638 my ($self, $w, $h, $changed) = @_;
2656 2639
2640 return unless $changed;
2641
2657 $self->SUPER::size_allocate ($w - 4, $h - 4); 2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2658} 2643}
2659 2644
2660sub _draw { 2645sub _draw {
2661 my ($self) = @_; 2646 my ($self) = @_;
2662 2647
… …
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804 2789
2805 $row++; 2790 $row++;
2806 } 2791 }
2807}
2808
2809sub size_request {
2810 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h});
2812} 2792}
2813 2793
2814############################################################################# 2794#############################################################################
2815 2795
2816package CFClient::UI::Menu; 2796package CFClient::UI::Menu;
… …
3002use CFClient::OpenGL; 2982use CFClient::OpenGL;
3003 2983
3004sub new { 2984sub new {
3005 my $class = shift; 2985 my $class = shift;
3006 2986
3007 $class->SUPER::new ( 2987 my $self = $class->SUPER::new (
3008 visible => 1, 2988 visible => 1,
3009 @_, 2989 @_,
3010 ) 2990 );
2991
2992 Scalar::Util::weaken ($self->{root} = $self);
2993
2994 $self
3011} 2995}
3012 2996
3013sub configure { 2997sub configure {
3014 my ($self, $x, $y, $w, $h) = @_; 2998 my ($self, $x, $y, $w, $h) = @_;
3015 2999
3016 $self->{w} = $w; 3000 $self->{w} = $w;
3017 $self->{h} = $h; 3001 $self->{h} = $h;
3018} 3002}
3019 3003
3020sub check_size { 3004sub reconfigure {
3021 my ($self) = @_; 3005 my ($self) = @_;
3022 3006
3007 $self->SUPER::reconfigure;
3008
3023 $self->size_allocate ($self->{w}, $self->{h}) 3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
3024 if $self->{w}; 3010 if $self->{w};
3025} 3011}
3026 3012
3027sub size_request { 3013sub size_request {
3028 my ($self) = @_; 3014 my ($self) = @_;
3029 3015
3030 ($self->{w}, $self->{h}) 3016 ($self->{w}, $self->{h})
3031} 3017}
3032 3018
3033sub size_allocate { 3019sub size_allocate {
3034 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h, $changed) = @_;
3035 3021
3036 for my $child ($self->children) { 3022 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3024
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3040 if exists $child->{req_x}; 3026 if exists $child->{req_x};
3041 3027
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3043 if exists $child->{req_y}; 3029 if exists $child->{req_y};
3044 3030
3045 $X = $self->{user_x} if exists $self->{user_x}; 3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047 3032
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3035
3051 $child->configure ($X, $Y, $W, $H); 3036 $child->configure ($X, $Y, $W, $H);
… …
3065} 3050}
3066 3051
3067sub update { 3052sub update {
3068 my ($self) = @_; 3053 my ($self) = @_;
3069 3054
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3055 $::WANT_REFRESH++;
3072} 3056}
3073 3057
3074sub add { 3058sub add {
3075 my ($self, @children) = @_; 3059 my ($self, @children) = @_;
3076
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082 3060
3083 for my $child (@children) { 3061 for my $child (@children) {
3084 $child->{is_toplevel} = 1; 3062 $child->{is_toplevel} = 1;
3085 3063
3086 # integerise window positions 3064 # integerise window positions
… …
3121 while ($self->{refresh_hook}) { 3099 while ($self->{refresh_hook}) {
3122 $_->() 3100 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3101 for values %{delete $self->{refresh_hook}};
3124 } 3102 }
3125 3103
3126 if ($self->{check_size}) { 3104 if ($self->{realloc}) {
3127 my @queue; 3105 my @queue;
3128 3106
3129 for (;;) { 3107 while () {
3130 if ($self->{check_size}) { 3108 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach 3109 #TODO use array-of-depth approach
3132 3110
3133 @queue = sort { $a->{visible} <=> $b->{visible} } 3111 @queue = sort { $a->{visible} <=> $b->{visible} }
3134 @queue, values %{delete $self->{check_size}}; 3112 @queue, values %{delete $self->{realloc}};
3135 } 3113 }
3136 3114
3137 my $widget = pop @queue || last; 3115 my $widget = pop @queue || last;
3138 3116
3139 defined $widget->{visible} or last; # do not resize invisible widgets 3117 $widget->{visible} or last; # do not resize invisible widgets
3140 3118
3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3142 ? @$widget{qw(user_w user_h)} 3120 ? @$widget{qw(def_w def_h)}
3143 : $widget->size_request; 3121 : $widget->size_request;
3144 3122
3145 if (delete $widget->{force_alloc}
3146 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3123 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3148 3124
3149 $widget->{req_w} = $w; 3125 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h; 3126 $widget->{req_h} = $h;
3151 3127
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3153 3129
3154 $widget->{parent}->check_size 3130 push @queue, $widget->{parent}
3155 if $widget->{parent}; 3131 if $widget->{parent};
3156 }
3157 } 3132 }
3158 } 3133 }
3159 3134
3160 while ($self->{size_alloc}) { 3135 while (my $size_alloc = delete $self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) { 3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3162 my ($widget, $w, $h) = @$_; 3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
3163 3141
3164 $w = 0 if $w < 0; 3142 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0; 3143 $h = 0 if $h < 0;
3166 3144
3167 $widget->{w} = $w; 3145 $widget->{w} = $w;
3168 $widget->{h} = $h; 3146 $widget->{h} = $h;
3169 $widget->emit (size_allocate => $w, $h); 3147 $widget->emit (size_allocate => $w, $h, 1);
3170 } 3148 }
3171 } 3149 }
3172 3150
3173 while ($self->{post_alloc_hook}) { 3151 while ($self->{post_alloc_hook}) {
3174 $_->() 3152 $_->()

Diff Legend

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