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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.252 by root, Sun May 28 23:21:28 2006 UTC

… …
47 my $tip = $widget->{tooltip}; 47 my $tip = $widget->{tooltip};
48 48
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 49 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 50
51 $TOOLTIP->set_tooltip_from ($widget); 51 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show;
53 52
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 53 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55 54
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0) 55 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH; 56 if $x + $TOOLTIP->{w} > $::WIDTH;
58 57
59 $TOOLTIP->move ($x, $y); 58 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update; 59 $TOOLTIP->show;
62 } 60 }
63 61
64 return; 62 return;
65 } 63 }
66 } 64 }
… …
175 for my $widget (values %WIDGET) { 173 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 174 if ($widget->{is_toplevel}) {
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 175 $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}; 176 $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}; 177 $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}; 178 $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}; 179 $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}; 180 $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 } 181 }
186 } 182 }
187 183
188 reconfigure_widgets; 184 reconfigure_widgets;
189} 185}
… …
214 } 210 }
215 211
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 212 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217 213
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 214 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 215 $self->{req_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 216 $self->{req_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 217 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 218 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 } 219 }
224 220
225 $self 221 $self
226} 222}
227 223
… …
232 %$self = (); 228 %$self = ();
233} 229}
234 230
235sub show { 231sub show {
236 my ($self) = @_; 232 my ($self) = @_;
233
237 return if $self->{parent}; 234 return if $self->{parent};
238 235
239 $CFClient::UI::ROOT->add ($self); 236 $CFClient::UI::ROOT->add ($self);
240} 237}
241 238
242sub show_centered { 239sub center {
243 my ($self) = @_; 240 my ($self) = @_;
244 return if $self->{parent};
245
246 $self->show;
247 241
248 $CFClient::UI::ROOT->on_post_alloc ( 242 $CFClient::UI::ROOT->on_post_alloc (
249 "centered $self" => sub { 243 "center_$self" => sub {
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 244 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
251 }, 245 },
252 ); 246 );
247
248 $self->update;
249}
250
251sub set_visible {
252 my ($self) = @_;
253
254 return if $self->{visible};
255
256 $self->{root} = $self->{parent}{root};
257 $self->{visible} = $self->{parent}{visible} + 1;
258
259 $self->emit (visibility_change => 1);
260
261 $self->realloc if !exists $self->{req_w};
262
263 $_->set_visible for $self->children;
253} 264}
254 265
255sub set_invisible { 266sub set_invisible {
256 my ($self) = @_; 267 my ($self) = @_;
257 268
258 # broken show/hide model 269 return unless $self->{visible};
270
271 $_->set_invisible for $self->children;
259 272
260 delete $self->{root}; 273 delete $self->{root};
261 delete $self->{visible}; 274 delete $self->{visible};
262 275
263 undef $GRAB if $GRAB == $self; 276 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 277 undef $HOVER if $HOVER == $self;
265 278
266 CFClient::UI::check_tooltip 279 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 280 if $TOOLTIP->{owner} == $self;
268 281
269 $self->focus_out; 282 $self->focus_out;
283
284 $self->emit (visibility_change => 0);
285}
286
287sub set_visibility {
288 my ($self, $visible) = @_;
289
290 return if $self->{visible} == $visible;
291
292 $visible ? $self->hide
293 : $self->show;
294}
295
296sub toggle_visibility {
297 my ($self) = @_;
298
299 $self->{visible}
300 ? $self->hide
301 : $self->show;
270} 302}
271 303
272sub hide { 304sub hide {
273 my ($self) = @_; 305 my ($self) = @_;
274 306
… …
289} 321}
290 322
291sub set_size { 323sub set_size {
292 my ($self, $w, $h) = @_; 324 my ($self, $w, $h) = @_;
293 325
294 $self->{user_w} = $w; 326 $self->{def_w} = $w;
295 $self->{user_h} = $h; 327 $self->{def_h} = $h;
296 328
297 $self->check_size; 329 $self->realloc;
298} 330}
299 331
300sub size_request { 332sub size_request {
301 require Carp; 333 require Carp;
302 Carp::confess "size_request is abstract"; 334 Carp::confess "size_request is abstract";
… …
322 $self->{y} = $y; 354 $self->{y} = $y;
323 $self->update; 355 $self->update;
324 } 356 }
325 357
326 if ($self->{w} != $w || $self->{h} != $h) { 358 if ($self->{w} != $w || $self->{h} != $h) {
359 return unless $self->{visible};
360
327 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 361 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
328 } 362 }
329} 363}
330 364
331sub size_allocate { 365sub size_allocate {
332 # nothing to be done 366 # nothing to be done
333}
334
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340} 367}
341 368
342sub children { 369sub children {
343} 370}
344 371
… …
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 449sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 450sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 451sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 452sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
426sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 453sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
454
455sub find_widget {
456 my ($self, $x, $y) = @_;
457
458 return () unless $self->{can_events};
459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471
472 $self->set_visible if $parent->{visible};
473}
474
475sub connect {
476 my ($self, $signal, $cb) = @_;
477
478 push @{ $self->{signal_cb}{$signal} }, $cb;
479}
480
481sub _emit {
482 my ($self, $signal, @args) = @_;
483
484 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
485}
486
487sub emit {
488 my ($self, $signal, @args) = @_;
489
490 $self->_emit ($signal, @args)
491 || $self->$signal (@args);
492}
493
494sub visibility_change {
495 #my ($self, $visible) = @_;
496}
497
498sub realloc {
499 my ($self) = @_;
500
501 if ($self->{visible}) {
502 return if $self->{root}{realloc}{$self};
503
504 $self->{root}{realloc}{$self} = $self;
505 $self->{root}->update;
506 } else {
507 delete $self->{req_w};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
427 517
428sub draw { 518sub draw {
429 my ($self) = @_; 519 my ($self) = @_;
430 520
431 return unless $self->{h} && $self->{w}; 521 return unless $self->{h} && $self->{w};
… …
469 my ($self) = @_; 559 my ($self) = @_;
470 560
471 warn "no draw defined for $self\n"; 561 warn "no draw defined for $self\n";
472} 562}
473 563
474sub find_widget {
475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
478
479 return $self
480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483 ()
484}
485
486sub set_parent {
487 my ($self, $parent) = @_;
488
489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
499}
500
501sub check_size {
502 my ($self, $forced) = @_;
503
504 $self->{force_alloc} = 1 if $forced;
505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519}
520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
527sub emit {
528 my ($self, $signal, @args) = @_;
529
530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
532}
533
534sub DESTROY { 564sub DESTROY {
535 my ($self) = @_; 565 my ($self) = @_;
536 566
537 delete $WIDGET{$self+0}; 567 delete $WIDGET{$self+0};
538 #$self->deactivate; 568 #$self->deactivate;
… …
633 $self->{children} = [ 663 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 664 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 665 @{$self->{children}}, @widgets
636 ]; 666 ];
637 667
638 $self->check_size (1); 668 $self->realloc;
639 $self->update;
640} 669}
641 670
642sub children { 671sub children {
643 @{ $_[0]{children} } 672 @{ $_[0]{children} }
644} 673}
… …
649 delete $child->{parent}; 678 delete $child->{parent};
650 $child->hide; 679 $child->hide;
651 680
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 682
654 $self->check_size (1); 683 $self->realloc;
655 $self->update;
656} 684}
657 685
658sub clear { 686sub clear {
659 my ($self) = @_; 687 my ($self) = @_;
660 688
… …
664 for (@$children) { 692 for (@$children) {
665 delete $_->{parent}; 693 delete $_->{parent};
666 $_->hide; 694 $_->hide;
667 } 695 }
668 696
669 $self->check_size; 697 $self->realloc;
670 $self->update;
671} 698}
672 699
673sub find_widget { 700sub find_widget {
674 my ($self, $x, $y) = @_; 701 my ($self, $x, $y) = @_;
675 702
… …
728sub size_request { 755sub size_request {
729 $_[0]{children}[0]->size_request 756 $_[0]{children}[0]->size_request
730} 757}
731 758
732sub size_allocate { 759sub size_allocate {
733 my ($self, $w, $h) = @_; 760 my ($self, $w, $h, $changed) = @_;
734 761
735 $self->{children}[0]->configure (0, 0, $w, $h); 762 $self->{children}[0]->configure (0, 0, $w, $h);
736} 763}
737 764
738############################################################################# 765#############################################################################
… …
755 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 782 $ROOT->on_post_alloc ($self => sub { $self->render_child });
756 $self->SUPER::update; 783 $self->SUPER::update;
757} 784}
758 785
759sub size_allocate { 786sub size_allocate {
760 my ($self, $w, $h) = @_; 787 my ($self, $w, $h, $changed) = @_;
761 788
762 $self->SUPER::size_allocate ($w, $h); 789 $self->SUPER::size_allocate ($w, $h, $changed);
763 $self->update; 790 $self->update
791 if $changed;
764} 792}
765 793
766sub _render { 794sub _render {
767 $_[0]{children}[0]->draw; 795 $_[0]{children}[0]->draw;
768} 796}
… …
812} 840}
813 841
814sub size_request { 842sub size_request {
815 my ($self) = @_; 843 my ($self) = @_;
816 844
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 845 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
818 846
819 @$self{qw(child_w child_h)} 847 $w = 10 if $self->{scroll_x};
848 $h = 10 if $self->{scroll_y};
849
850 ($w, $h)
820} 851}
821 852
822sub size_allocate { 853sub size_allocate {
823 my ($self, $w, $h) = @_; 854 my ($self, $w, $h, $changed) = @_;
824 855
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 856 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 857 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
827 858
828 $self->child->configure (0, 0, $w, $h); 859 $self->child->configure (0, 0, $w, $h);
… …
915 my $child = $self->{vp}->child; 946 my $child = $self->{vp}->child;
916 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 947 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
917} 948}
918 949
919sub size_allocate { 950sub size_allocate {
920 my ($self, $w, $h) = @_; 951 my ($self, $w, $h, $changed) = @_;
921 952
922 $self->SUPER::size_allocate ($w, $h); 953 $self->SUPER::size_allocate ($w, $h, $changed);
923 954
924 my $child = $self->{vp}->child; 955 my $child = $self->{vp}->child;
925 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 956 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
926} 957}
927 958
… …
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1012 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982 1013
983sub new { 1014sub new {
984 my $class = shift; 1015 my $class = shift;
985
986 # TODO: user_x, user_y, overwrite moveto?
987 1016
988 my $self = $class->SUPER::new ( 1017 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1018 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1019 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1020 border => 0.6,
… …
1017 $h + $self->border * 2, 1046 $h + $self->border * 2,
1018 ) 1047 )
1019} 1048}
1020 1049
1021sub size_allocate { 1050sub size_allocate {
1022 my ($self, $w, $h) = @_; 1051 my ($self, $w, $h, $changed) = @_;
1052
1053 return unless $changed;
1023 1054
1024 $h -= List::Util::max 0, $self->border * 2; 1055 $h -= List::Util::max 0, $self->border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1056 $w -= List::Util::max 0, $self->border * 2;
1026 1057
1027 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1058 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1053 my $dx = $ev->{x} - $ox; 1084 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1085 my $dy = $ev->{y} - $oy;
1055 1086
1056 $self->{user_x} = $wx + $dx * $mx; 1087 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my; 1088 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1089 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1090 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y}); 1091 $self->move ($self->{user_x}, $self->{user_y});
1061 $self->check_size; 1092 $self->realloc;
1062 }; 1093 };
1063 1094
1064 } elsif ($lr ^ $td) { 1095 } elsif ($lr ^ $td) {
1065 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1096 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066 my ($bx, $by) = ($self->{x}, $self->{y}); 1097 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1070 1101
1071 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 ($x, $y) = ($ev->{x}, $ev->{y});
1072 1103
1073 $self->{user_x} = $bx + $x - $ox; 1104 $self->{user_x} = $bx + $x - $ox;
1074 $self->{user_y} = $by + $y - $oy; 1105 $self->{user_y} = $by + $y - $oy;
1106
1075 $self->move ($self->{user_x}, $self->{user_y}); 1107 $self->move ($self->{user_x}, $self->{user_y});
1076 $self->update; 1108 $self->realloc;
1077 }; 1109 };
1078 } 1110 }
1079} 1111}
1080 1112
1081sub button_up { 1113sub button_up {
… …
1156 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
1157 1189
1158 $child->set_parent ($self); 1190 $child->set_parent ($self);
1159 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
1160 1192
1161 $self->check_size (1); 1193 $self->realloc;
1162} 1194}
1163 1195
1164# TODO: move to container class maybe? send children a signal on removal? 1196# TODO: move to container class maybe? send children a signal on removal?
1165sub clear { 1197sub clear {
1166 my ($self) = @_; 1198 my ($self) = @_;
… …
1171 for (@children) { 1203 for (@children) {
1172 delete $_->{parent}; 1204 delete $_->{parent};
1173 $_->hide; 1205 $_->hide;
1174 } 1206 }
1175 1207
1176 $self->check_size (1); 1208 $self->realloc;
1177 $self->update;
1178} 1209}
1179 1210
1180sub get_wh { 1211sub get_wh {
1181 my ($self) = @_; 1212 my ($self) = @_;
1182 1213
… …
1209 (sum @$hs), 1240 (sum @$hs),
1210 ) 1241 )
1211} 1242}
1212 1243
1213sub size_allocate { 1244sub size_allocate {
1214 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
1215 1246
1216 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1217 1248
1218 my $req_w = (sum @$ws) || 1; 1249 my $req_w = (sum @$ws) || 1;
1219 my $req_h = (sum @$hs) || 1; 1250 my $req_h = (sum @$hs) || 1;
… …
1278 } 1309 }
1279} 1310}
1280 1311
1281############################################################################# 1312#############################################################################
1282 1313
1314package CFClient::UI::Box;
1315
1316our @ISA = CFClient::UI::Container::;
1317
1318sub size_request {
1319 my ($self) = @_;
1320
1321 $self->{vertical}
1322 ? (
1323 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1324 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1325 )
1326 : (
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 )
1330}
1331
1332sub size_allocate {
1333 my ($self, $w, $h, $changed) = @_;
1334
1335 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children};
1337
1338 my @req;
1339
1340 if ($self->{homogeneous}) {
1341 @req = ($space / (@$children || 1)) x @$children;
1342 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1344 my $req = List::Util::sum @req;
1345
1346 if ($req > $space) {
1347 # ah well, not enough space
1348 $_ *= $space / $req for @req;
1349 } else {
1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1351
1352 $space = ($space - $req) / $expand; # remaining space to give away
1353
1354 $req[$_] += $space * $children->[$_]{expand}
1355 for 0 .. $#$children;
1356 }
1357 }
1358
1359 CFClient::UI::harmonize \@req;
1360
1361 my $pos = 0;
1362 for (0 .. $#$children) {
1363 my $alloc = $req[$_];
1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1365
1366 $pos += $alloc;
1367 }
1368
1369 1
1370}
1371
1372#############################################################################
1373
1283package CFClient::UI::HBox; 1374package CFClient::UI::HBox;
1284 1375
1285# TODO: wrap into common Box base class
1286
1287our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Box::;
1288 1377
1289sub size_request { 1378sub new {
1290 my ($self) = @_; 1379 my $class = shift;
1291 1380
1292 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $class->SUPER::new (
1293 1382 vertical => 0,
1294 ( 1383 @_,
1295 (List::Util::sum map $_->[0], @alloc),
1296 (List::Util::max map $_->[1], @alloc),
1297 ) 1384 )
1298} 1385}
1299 1386
1300sub size_allocate {
1301 my ($self, $w, $h) = @_;
1302
1303 ($h, $w) = ($w, $h);
1304
1305 my $children = $self->{children};
1306
1307 my @h = map $_->{req_w}, @$children;
1308
1309 my $req_h = List::Util::sum @h;
1310
1311 if ($req_h > $h) {
1312 # ah well, not enough space
1313 $_ *= $h / $req_h for @h;
1314 } else {
1315 my $exp = List::Util::sum map $_->{expand}, @$children;
1316 $exp ||= 1;
1317
1318 for (0 .. $#$children) {
1319 my $child = $children->[$_];
1320
1321 my $alloc_h = $h[$_];
1322 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323 $h[$_] = $alloc_h;
1324 }
1325 }
1326
1327 CFClient::UI::harmonize \@h;
1328
1329 my $y = 0;
1330 for (0 .. $#$children) {
1331 my $child = $children->[$_];
1332 my $h = $h[$_];
1333 $child->configure ($y, 0, $h, $w);
1334
1335 $y += $h;
1336 }
1337
1338 1
1339}
1340
1341############################################################################# 1387#############################################################################
1342 1388
1343package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1344 1390
1345# TODO: wrap into common Box base class
1346
1347our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1348 1392
1349sub size_request { 1393sub new {
1350 my ($self) = @_; 1394 my $class = shift;
1351 1395
1352 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1353 1397 vertical => 1,
1354 ( 1398 @_,
1355 (List::Util::max map $_->[0], @alloc),
1356 (List::Util::sum map $_->[1], @alloc),
1357 ) 1399 )
1358}
1359
1360sub size_allocate {
1361 my ($self, $w, $h) = @_;
1362
1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365 my $children = $self->{children};
1366
1367 my @h = map $_->{req_h}, @$children;
1368
1369 my $req_h = List::Util::sum @h;
1370
1371 if ($req_h > $h) {
1372 # ah well, not enough space
1373 $_ *= $h / $req_h for @h;
1374 } else {
1375 my $exp = List::Util::sum map $_->{expand}, @$children;
1376 $exp ||= 1;
1377
1378 for (0 .. $#$children) {
1379 my $child = $children->[$_];
1380
1381 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382 }
1383 }
1384
1385 CFClient::UI::harmonize \@h;
1386
1387 my $y = 0;
1388 for (0 .. $#$children) {
1389 my $child = $children->[$_];
1390 my $h = $h[$_];
1391 $child->configure (0, $y, $w, $h);
1392
1393 $y += $h;
1394 }
1395
1396 1
1397} 1400}
1398 1401
1399############################################################################# 1402#############################################################################
1400 1403
1401package CFClient::UI::Label; 1404package CFClient::UI::Label;
… …
1464 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1465 1468
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1468 1471
1472 $self->realloc;
1469 $self->update; 1473 $self->update;
1470 $self->check_size;
1471} 1474}
1472 1475
1473sub set_markup { 1476sub set_markup {
1474 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1475 1478
… …
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480 1483
1481 $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;
1482 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1483 1486
1487 $self->realloc;
1484 $self->update; 1488 $self->update;
1485 $self->check_size;
1486} 1489}
1487 1490
1488sub size_request { 1491sub size_request {
1489 my ($self) = @_; 1492 my ($self) = @_;
1490 1493
… …
1511 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1512 ) 1515 )
1513} 1516}
1514 1517
1515sub size_allocate { 1518sub size_allocate {
1516 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1517 1520
1518 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1519} 1523}
1520 1524
1521sub set_fontsize { 1525sub set_fontsize {
1522 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1523 1527
1524 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1525 delete $self->{texture}; 1529 delete $self->{texture};
1526 1530
1527 $self->update; 1531 $self->realloc;
1528 $self->check_size;
1529} 1532}
1530 1533
1531sub _draw { 1534sub _draw {
1532 my ($self) = @_; 1535 my ($self) = @_;
1533 1536
… …
1613sub set_text { 1616sub set_text {
1614 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1615 1618
1616 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1617 $self->_set_text ($text); 1620 $self->_set_text ($text);
1618 $self->update; 1621
1619 $self->check_size; 1622 $self->realloc;
1620} 1623}
1621 1624
1622sub get_text { 1625sub get_text {
1623 $_[0]{text} 1626 $_[0]{text}
1624} 1627}
… …
1657 } elsif ($uni) { 1660 } elsif ($uni) {
1658 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1659 } 1662 }
1660 1663
1661 $self->_set_text ($text); 1664 $self->_set_text ($text);
1662 $self->update; 1665
1663 $self->check_size; 1666 $self->realloc;
1664} 1667}
1665 1668
1666sub focus_in { 1669sub focus_in {
1667 my ($self) = @_; 1670 my ($self) = @_;
1668 1671
… …
2175 $self->update; 2178 $self->update;
2176 2179
2177 $self 2180 $self
2178} 2181}
2179 2182
2183sub changed { }
2184
2180sub set_range { 2185sub set_range {
2181 my ($self, $range) = @_; 2186 my ($self, $range) = @_;
2182 2187
2183 ($range, $self->{range}) = ($self->{range}, $range); 2188 ($range, $self->{range}) = ($self->{range}, $range);
2184 2189
… …
2373 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2379 $self->reflow;
2375} 2380}
2376 2381
2377sub size_allocate { 2382sub size_allocate {
2378 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
2379 2384
2380 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2381 2388
2382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
2383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2384 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
2385 2392
… …
2579 state => 0, 2586 state => 0,
2580 on_activate => \&toggle_flopper, 2587 on_activate => \&toggle_flopper,
2581 @_ 2588 @_
2582 ); 2589 );
2583 2590
2584 if ($self->{state}) {
2585 $self->{state} = 0;
2586 $self->toggle_flopper;
2587 }
2588
2589 $self 2591 $self
2590} 2592}
2591 2593
2592sub toggle_flopper { 2594sub toggle_flopper {
2593 my ($self) = @_; 2595 my ($self) = @_;
2594 2596
2595 # TODO: use animation 2597 $self->{other}->toggle_visibility;
2596 if ($self->{state} = !$self->{state}) {
2597 $CFClient::UI::ROOT->add ($self->{other});
2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2599 $self->_emit ("open");
2600 } else {
2601 $CFClient::UI::ROOT->remove ($self->{other});
2602 $self->_emit ("close");
2603 }
2604
2605 $self->_emit (changed => $self->{state});
2606} 2598}
2607 2599
2608############################################################################# 2600#############################################################################
2609 2601
2610package CFClient::UI::Tooltip; 2602package CFClient::UI::Tooltip;
… …
2642 2634
2643 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2644} 2636}
2645 2637
2646sub size_allocate { 2638sub size_allocate {
2647 my ($self, $w, $h) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2648 2640
2641 return unless $changed;
2642
2649 $self->SUPER::size_allocate ($w - 4, $h - 4); 2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2650} 2644}
2651 2645
2652sub _draw { 2646sub _draw {
2653 my ($self) = @_; 2647 my ($self) = @_;
2654 2648
… …
2671 glVertex $w, $h; 2665 glVertex $w, $h;
2672 glVertex $w, 0; 2666 glVertex $w, 0;
2673 glEnd; 2667 glEnd;
2674 2668
2675 glTranslate 2 - 0.375, 2 - 0.375; 2669 glTranslate 2 - 0.375, 2 - 0.375;
2670
2676 $self->SUPER::_draw; 2671 $self->SUPER::_draw;
2677} 2672}
2678 2673
2679############################################################################# 2674#############################################################################
2680 2675
… …
2794 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2789 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2795 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2790 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2796 2791
2797 $row++; 2792 $row++;
2798 } 2793 }
2799}
2800
2801sub size_request {
2802 my ($self) = @_;
2803 ($self->{req_w}, $self->{req_h});
2804} 2794}
2805 2795
2806############################################################################# 2796#############################################################################
2807 2797
2808package CFClient::UI::Menu; 2798package CFClient::UI::Menu;
… …
2994use CFClient::OpenGL; 2984use CFClient::OpenGL;
2995 2985
2996sub new { 2986sub new {
2997 my $class = shift; 2987 my $class = shift;
2998 2988
2999 $class->SUPER::new ( 2989 my $self = $class->SUPER::new (
3000 visible => 1, 2990 visible => 1,
3001 @_, 2991 @_,
3002 ) 2992 );
2993
2994 Scalar::Util::weaken ($self->{root} = $self);
2995
2996 $self
3003} 2997}
3004 2998
3005sub configure { 2999sub configure {
3006 my ($self, $x, $y, $w, $h) = @_; 3000 my ($self, $x, $y, $w, $h) = @_;
3007 3001
3008 $self->{w} = $w; 3002 $self->{w} = $w;
3009 $self->{h} = $h; 3003 $self->{h} = $h;
3010} 3004}
3011 3005
3012sub check_size { 3006sub reconfigure {
3013 my ($self) = @_; 3007 my ($self) = @_;
3014 3008
3009 $self->SUPER::reconfigure;
3010
3015 $self->size_allocate ($self->{w}, $self->{h}) 3011 $self->size_allocate ($self->{w}, $self->{h}, 1)
3016 if $self->{w}; 3012 if $self->{w};
3017} 3013}
3018 3014
3019sub size_request { 3015sub size_request {
3020 my ($self) = @_; 3016 my ($self) = @_;
3021 3017
3022 ($self->{w}, $self->{h}) 3018 ($self->{w}, $self->{h})
3023} 3019}
3024 3020
3025sub size_allocate { 3021sub size_allocate {
3026 my ($self, $w, $h) = @_; 3022 my ($self, $w, $h, $changed) = @_;
3027 3023
3028 for my $child ($self->children) { 3024 for my $child ($self->children) {
3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3025 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030 3026
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3032 if exists $child->{req_x}; 3028 if exists $child->{req_x};
3033 3029
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3035 if exists $child->{req_y}; 3031 if exists $child->{req_y};
3036 3032
3033 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3034
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3035 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3036 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039 3037
3040 $child->configure ($X, $Y, $W, $H); 3038 $child->configure ($X, $Y, $W, $H);
3041 } 3039 }
… …
3054} 3052}
3055 3053
3056sub update { 3054sub update {
3057 my ($self) = @_; 3055 my ($self) = @_;
3058 3056
3059 $self->check_size;
3060 $::WANT_REFRESH++; 3057 $::WANT_REFRESH++;
3061} 3058}
3062 3059
3063sub add { 3060sub add {
3064 my ($self, @children) = @_; 3061 my ($self, @children) = @_;
3065
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071 3062
3072 for my $child (@children) { 3063 for my $child (@children) {
3073 $child->{is_toplevel} = 1; 3064 $child->{is_toplevel} = 1;
3074 3065
3075 # integerise window positions 3066 # integerise window positions
… …
3110 while ($self->{refresh_hook}) { 3101 while ($self->{refresh_hook}) {
3111 $_->() 3102 $_->()
3112 for values %{delete $self->{refresh_hook}}; 3103 for values %{delete $self->{refresh_hook}};
3113 } 3104 }
3114 3105
3115 if ($self->{check_size}) { 3106 if ($self->{realloc}) {
3116 my @queue; 3107 my @queue;
3117 3108
3118 for (;;) { 3109 while () {
3119 if ($self->{check_size}) { 3110 if ($self->{realloc}) {
3120 #TODO use array-of-depth approach 3111 #TODO use array-of-depth approach
3121 3112
3122 @queue = sort { $a->{visible} <=> $b->{visible} } 3113 @queue = sort { $a->{visible} <=> $b->{visible} }
3123 @queue, values %{delete $self->{check_size}}; 3114 @queue, values %{delete $self->{realloc}};
3124 } 3115 }
3125 3116
3126 my $widget = pop @queue || last; 3117 my $widget = pop @queue || last;
3127 3118
3128 defined $widget->{visible} or last; # do not resize invisible widgets 3119 $widget->{visible} or last; # do not resize invisible widgets
3129 3120
3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3121 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3131 ? @$widget{qw(user_w user_h)} 3122 ? @$widget{qw(def_w def_h)}
3132 : $widget->size_request; 3123 : $widget->size_request;
3133 3124
3134 if (delete $widget->{force_alloc}
3135 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3125 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137 3126
3138 $widget->{req_w} = $w; 3127 $widget->{req_w} = $w;
3139 $widget->{req_h} = $h; 3128 $widget->{req_h} = $h;
3140 3129
3141 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3130 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3142 3131
3143 $widget->{parent}->check_size 3132 push @queue, $widget->{parent}
3144 if $widget->{parent}; 3133 if $widget->{parent};
3145 }
3146 } 3134 }
3147 } 3135 }
3148 3136
3149 while ($self->{size_alloc}) { 3137 while (my $size_alloc = delete $self->{size_alloc}) {
3150 for (values %{delete $self->{size_alloc}}) { 3138 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3151 my ($widget, $w, $h) = @$_; 3139 values %$size_alloc;
3140
3141 while () {
3142 my ($widget, $w, $h) = @{ pop @queue or last };
3152 3143
3153 $w = 0 if $w < 0; 3144 $w = 0 if $w < 0;
3154 $h = 0 if $h < 0; 3145 $h = 0 if $h < 0;
3155 3146
3147 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3148
3156 $widget->{w} = $w; 3149 $widget->{w} = $w;
3157 $widget->{h} = $h; 3150 $widget->{h} = $h;
3151
3158 $widget->emit (size_allocate => $w, $h); 3152 $widget->emit (size_allocate => $w, $h, $changed);
3159 } 3153 }
3160 } 3154 }
3161 3155
3162 while ($self->{post_alloc_hook}) { 3156 while ($self->{post_alloc_hook}) {
3163 $_->() 3157 $_->()

Diff Legend

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