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.242 by elmex, Sat May 27 20:00:40 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}
… …
206 can_events => 1, 203 can_events => 1,
207 @_ 204 @_
208 }, $class; 205 }, $class;
209 206
210 for (keys %$self) { 207 for (keys %$self) {
211 if (/^connect_(.*)$/) { 208 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 209 $self->connect ($1 => delete $self->{$_});
213 } 210 }
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} 223}
227 224
… …
232 %$self = (); 229 %$self = ();
233} 230}
234 231
235sub show { 232sub show {
236 my ($self) = @_; 233 my ($self) = @_;
234
237 return if $self->{parent}; 235 return if $self->{parent};
238 236
239 $CFClient::UI::ROOT->add ($self); 237 $CFClient::UI::ROOT->add ($self);
240} 238}
241 239
242sub show_centered { 240sub center {
243 my ($self) = @_; 241 my ($self) = @_;
244 return if $self->{parent};
245
246 $self->show;
247 242
248 $CFClient::UI::ROOT->on_post_alloc ( 243 $CFClient::UI::ROOT->on_post_alloc (
249 "centered $self" => sub { 244 "center_$self" => sub {
250 $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);
251 }, 246 },
252 ); 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;
253} 265}
254 266
255sub set_invisible { 267sub set_invisible {
256 my ($self) = @_; 268 my ($self) = @_;
257 269
258 # broken show/hide model 270 return unless $self->{visible};
271
272 $_->set_invisible for $self->children;
259 273
260 delete $self->{root}; 274 delete $self->{root};
261 delete $self->{visible}; 275 delete $self->{visible};
262 276
263 undef $GRAB if $GRAB == $self; 277 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 278 undef $HOVER if $HOVER == $self;
265 279
266 CFClient::UI::check_tooltip 280 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 281 if $TOOLTIP->{owner} == $self;
268 282
269 $self->focus_out; 283 $self->focus_out;
284
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;
270} 303}
271 304
272sub hide { 305sub hide {
273 my ($self) = @_; 306 my ($self) = @_;
274 307
… …
289} 322}
290 323
291sub set_size { 324sub set_size {
292 my ($self, $w, $h) = @_; 325 my ($self, $w, $h) = @_;
293 326
294 $self->{user_w} = $w; 327 $self->{def_w} = $w;
295 $self->{user_h} = $h; 328 $self->{def_h} = $h;
296 329
297 $self->check_size; 330 $self->realloc;
298} 331}
299 332
300sub size_request { 333sub size_request {
301 require Carp; 334 require Carp;
302 Carp::confess "size_request is abstract"; 335 Carp::confess "size_request is abstract";
… …
322 $self->{y} = $y; 355 $self->{y} = $y;
323 $self->update; 356 $self->update;
324 } 357 }
325 358
326 if ($self->{w} != $w || $self->{h} != $h) { 359 if ($self->{w} != $w || $self->{h} != $h) {
360 return unless $self->{visible};
361
327 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
328 } 363 }
329} 364}
330 365
331sub size_allocate { 366sub size_allocate {
332 # nothing to be done 367 # nothing to be done
333}
334
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340} 368}
341 369
342sub children { 370sub children {
343} 371}
344 372
… …
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
426sub 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}
427 518
428sub draw { 519sub draw {
429 my ($self) = @_; 520 my ($self) = @_;
430 521
431 return unless $self->{h} && $self->{w}; 522 return unless $self->{h} && $self->{w};
… …
469 my ($self) = @_; 560 my ($self) = @_;
470 561
471 warn "no draw defined for $self\n"; 562 warn "no draw defined for $self\n";
472} 563}
473 564
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 { 565sub DESTROY {
535 my ($self) = @_; 566 my ($self) = @_;
536 567
537 delete $WIDGET{$self+0}; 568 delete $WIDGET{$self+0};
538 #$self->deactivate; 569 #$self->deactivate;
… …
633 $self->{children} = [ 664 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 665 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 666 @{$self->{children}}, @widgets
636 ]; 667 ];
637 668
638 $self->check_size (1); 669 $self->realloc;
639 $self->update;
640} 670}
641 671
642sub children { 672sub children {
643 @{ $_[0]{children} } 673 @{ $_[0]{children} }
644} 674}
… …
649 delete $child->{parent}; 679 delete $child->{parent};
650 $child->hide; 680 $child->hide;
651 681
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 682 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 683
654 $self->check_size (1); 684 $self->realloc;
655 $self->update;
656} 685}
657 686
658sub clear { 687sub clear {
659 my ($self) = @_; 688 my ($self) = @_;
660 689
… …
664 for (@$children) { 693 for (@$children) {
665 delete $_->{parent}; 694 delete $_->{parent};
666 $_->hide; 695 $_->hide;
667 } 696 }
668 697
669 $self->check_size; 698 $self->realloc;
670 $self->update;
671} 699}
672 700
673sub find_widget { 701sub find_widget {
674 my ($self, $x, $y) = @_; 702 my ($self, $x, $y) = @_;
675 703
… …
728sub size_request { 756sub size_request {
729 $_[0]{children}[0]->size_request 757 $_[0]{children}[0]->size_request
730} 758}
731 759
732sub size_allocate { 760sub size_allocate {
733 my ($self, $w, $h) = @_; 761 my ($self, $w, $h, $changed) = @_;
734 762
735 $self->{children}[0]->configure (0, 0, $w, $h); 763 $self->{children}[0]->configure (0, 0, $w, $h);
736} 764}
737 765
738############################################################################# 766#############################################################################
… …
755 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 783 $ROOT->on_post_alloc ($self => sub { $self->render_child });
756 $self->SUPER::update; 784 $self->SUPER::update;
757} 785}
758 786
759sub size_allocate { 787sub size_allocate {
760 my ($self, $w, $h) = @_; 788 my ($self, $w, $h, $changed) = @_;
761 789
762 $self->SUPER::size_allocate ($w, $h); 790 $self->SUPER::size_allocate ($w, $h, $changed);
763 $self->update; 791 $self->update
792 if $changed;
764} 793}
765 794
766sub _render { 795sub _render {
767 $_[0]{children}[0]->draw; 796 $_[0]{children}[0]->draw;
768} 797}
… …
812} 841}
813 842
814sub size_request { 843sub size_request {
815 my ($self) = @_; 844 my ($self) = @_;
816 845
817 @$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)};
818 847
819 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
820} 852}
821 853
822sub size_allocate { 854sub size_allocate {
823 my ($self, $w, $h) = @_; 855 my ($self, $w, $h, $changed) = @_;
824 856
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
827 859
828 $self->child->configure (0, 0, $w, $h); 860 $self->child->configure (0, 0, $w, $h);
… …
884 my $class = shift; 916 my $class = shift;
885 917
886 my $self; 918 my $self;
887 919
888 my $slider = new CFClient::UI::Slider 920 my $slider = new CFClient::UI::Slider
889 vertical => 1, 921 vertical => 1,
890 range => [0, 0, 1, 0.01], # HACK fix 922 range => [0, 0, 1, 0.01], # HACK fix
891 connect_changed => sub { 923 on_changed => sub {
892 $self->{vp}->set_offset (0, $_[1]); 924 $self->{vp}->set_offset (0, $_[1]);
893 }, 925 },
894 ; 926 ;
895 927
896 $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
… …
915 my $child = $self->{vp}->child; 947 my $child = $self->{vp}->child;
916 $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]);
917} 949}
918 950
919sub size_allocate { 951sub size_allocate {
920 my ($self, $w, $h) = @_; 952 my ($self, $w, $h, $changed) = @_;
921 953
922 $self->SUPER::size_allocate ($w, $h); 954 $self->SUPER::size_allocate ($w, $h, $changed);
923 955
924 my $child = $self->{vp}->child; 956 my $child = $self->{vp}->child;
925 $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]);
926} 958}
927 959
… …
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1012 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); 1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982 1014
983sub new { 1015sub new {
984 my $class = shift; 1016 my $class = shift;
985
986 # TODO: user_x, user_y, overwrite moveto?
987 1017
988 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1021 border => 0.6,
… …
1017 $h + $self->border * 2, 1047 $h + $self->border * 2,
1018 ) 1048 )
1019} 1049}
1020 1050
1021sub size_allocate { 1051sub size_allocate {
1022 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h, $changed) = @_;
1053
1054 return unless $changed;
1023 1055
1024 $h -= List::Util::max 0, $self->border * 2; 1056 $h -= List::Util::max 0, $self->border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1057 $w -= List::Util::max 0, $self->border * 2;
1026 1058
1027 $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)
… …
1051 my ($ev, $x, $y) = @_; 1083 my ($ev, $x, $y) = @_;
1052 1084
1053 my $dx = $ev->{x} - $ox; 1085 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1086 my $dy = $ev->{y} - $oy;
1055 1087
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
1056 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1057 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1058 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1092 $self->move ($self->{user_x}, $self->{user_y});
1059 $self->check_size; 1093 $self->realloc;
1060 }; 1094 };
1061 1095
1062 } elsif ($lr ^ $td) { 1096 } elsif ($lr ^ $td) {
1063 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1097 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1064 my ($bx, $by) = ($self->{x}, $self->{y}); 1098 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1066 $self->{motion} = sub { 1100 $self->{motion} = sub {
1067 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
1068 1102
1069 ($x, $y) = ($ev->{x}, $ev->{y}); 1103 ($x, $y) = ($ev->{x}, $ev->{y});
1070 1104
1071 $self->move ($bx + $x - $ox, $by + $y - $oy); 1105 $self->{user_x} = $bx + $x - $ox;
1106 $self->{user_y} = $by + $y - $oy;
1107
1108 $self->move ($self->{user_x}, $self->{user_y});
1072 $self->update; 1109 $self->realloc;
1073 }; 1110 };
1074 } 1111 }
1075} 1112}
1076 1113
1077sub button_up { 1114sub button_up {
… …
1152 my ($self, $x, $y, $child) = @_; 1189 my ($self, $x, $y, $child) = @_;
1153 1190
1154 $child->set_parent ($self); 1191 $child->set_parent ($self);
1155 $self->{children}[$y][$x] = $child; 1192 $self->{children}[$y][$x] = $child;
1156 1193
1157 $self->check_size (1); 1194 $self->realloc;
1158} 1195}
1159 1196
1160# 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?
1161sub clear { 1198sub clear {
1162 my ($self) = @_; 1199 my ($self) = @_;
… …
1167 for (@children) { 1204 for (@children) {
1168 delete $_->{parent}; 1205 delete $_->{parent};
1169 $_->hide; 1206 $_->hide;
1170 } 1207 }
1171 1208
1172 $self->check_size (1); 1209 $self->realloc;
1173 $self->update;
1174} 1210}
1175 1211
1176sub get_wh { 1212sub get_wh {
1177 my ($self) = @_; 1213 my ($self) = @_;
1178 1214
… …
1205 (sum @$hs), 1241 (sum @$hs),
1206 ) 1242 )
1207} 1243}
1208 1244
1209sub size_allocate { 1245sub size_allocate {
1210 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h, $changed) = @_;
1211 1247
1212 my ($ws, $hs) = $self->get_wh; 1248 my ($ws, $hs) = $self->get_wh;
1213 1249
1214 my $req_w = (sum @$ws) || 1; 1250 my $req_w = (sum @$ws) || 1;
1215 my $req_h = (sum @$hs) || 1; 1251 my $req_h = (sum @$hs) || 1;
… …
1274 } 1310 }
1275} 1311}
1276 1312
1277############################################################################# 1313#############################################################################
1278 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
1279package CFClient::UI::HBox; 1375package CFClient::UI::HBox;
1280 1376
1281# TODO: wrap into common Box base class
1282
1283our @ISA = CFClient::UI::Container::; 1377our @ISA = CFClient::UI::Box::;
1284 1378
1285sub size_request { 1379sub new {
1286 my ($self) = @_; 1380 my $class = shift;
1287 1381
1288 my @alloc = map [$_->size_request], @{$self->{children}}; 1382 $class->SUPER::new (
1289 1383 vertical => 0,
1290 ( 1384 @_,
1291 (List::Util::sum map $_->[0], @alloc),
1292 (List::Util::max map $_->[1], @alloc),
1293 ) 1385 )
1294} 1386}
1295 1387
1296sub size_allocate {
1297 my ($self, $w, $h) = @_;
1298
1299 ($h, $w) = ($w, $h);
1300
1301 my $children = $self->{children};
1302
1303 my @h = map $_->{req_w}, @$children;
1304
1305 my $req_h = List::Util::sum @h;
1306
1307 if ($req_h > $h) {
1308 # ah well, not enough space
1309 $_ *= $h / $req_h for @h;
1310 } else {
1311 my $exp = List::Util::sum map $_->{expand}, @$children;
1312 $exp ||= 1;
1313
1314 for (0 .. $#$children) {
1315 my $child = $children->[$_];
1316
1317 my $alloc_h = $h[$_];
1318 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1319 $h[$_] = $alloc_h;
1320 }
1321 }
1322
1323 CFClient::UI::harmonize \@h;
1324
1325 my $y = 0;
1326 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_];
1329 $child->configure ($y, 0, $h, $w);
1330
1331 $y += $h;
1332 }
1333
1334 1
1335}
1336
1337############################################################################# 1388#############################################################################
1338 1389
1339package CFClient::UI::VBox; 1390package CFClient::UI::VBox;
1340 1391
1341# TODO: wrap into common Box base class
1342
1343our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Box::;
1344 1393
1345sub size_request { 1394sub new {
1346 my ($self) = @_; 1395 my $class = shift;
1347 1396
1348 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $class->SUPER::new (
1349 1398 vertical => 1,
1350 ( 1399 @_,
1351 (List::Util::max map $_->[0], @alloc),
1352 (List::Util::sum map $_->[1], @alloc),
1353 ) 1400 )
1354}
1355
1356sub size_allocate {
1357 my ($self, $w, $h) = @_;
1358
1359 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1360
1361 my $children = $self->{children};
1362
1363 my @h = map $_->{req_h}, @$children;
1364
1365 my $req_h = List::Util::sum @h;
1366
1367 if ($req_h > $h) {
1368 # ah well, not enough space
1369 $_ *= $h / $req_h for @h;
1370 } else {
1371 my $exp = List::Util::sum map $_->{expand}, @$children;
1372 $exp ||= 1;
1373
1374 for (0 .. $#$children) {
1375 my $child = $children->[$_];
1376
1377 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1378 }
1379 }
1380
1381 CFClient::UI::harmonize \@h;
1382
1383 my $y = 0;
1384 for (0 .. $#$children) {
1385 my $child = $children->[$_];
1386 my $h = $h[$_];
1387 $child->configure (0, $y, $w, $h);
1388
1389 $y += $h;
1390 }
1391
1392 1
1393} 1401}
1394 1402
1395############################################################################# 1403#############################################################################
1396 1404
1397package CFClient::UI::Label; 1405package CFClient::UI::Label;
… …
1460 $self->{text} = "T$text"; 1468 $self->{text} = "T$text";
1461 1469
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1471 $self->{layout}->set_text ($text);
1464 1472
1465 $self->update; 1473 $self->realloc;
1466 $self->check_size;
1467} 1474}
1468 1475
1469sub set_markup { 1476sub set_markup {
1470 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1471 1478
… …
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1483
1477 $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;
1478 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1479 1486
1480 $self->update; 1487 $self->realloc;
1481 $self->check_size;
1482} 1488}
1483 1489
1484sub size_request { 1490sub size_request {
1485 my ($self) = @_; 1491 my ($self) = @_;
1486 1492
… …
1507 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1508 ) 1514 )
1509} 1515}
1510 1516
1511sub size_allocate { 1517sub size_allocate {
1512 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1513 1519
1514 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1515} 1522}
1516 1523
1517sub set_fontsize { 1524sub set_fontsize {
1518 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1519 1526
1520 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1528 delete $self->{texture};
1522 1529
1523 $self->update; 1530 $self->realloc;
1524 $self->check_size;
1525} 1531}
1526 1532
1527sub _draw { 1533sub _draw {
1528 my ($self) = @_; 1534 my ($self) = @_;
1529 1535
… …
1609sub set_text { 1615sub set_text {
1610 my ($self, $text) = @_; 1616 my ($self, $text) = @_;
1611 1617
1612 $self->{cursor} = length $text; 1618 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1619 $self->_set_text ($text);
1614 $self->update; 1620
1615 $self->check_size; 1621 $self->realloc;
1616} 1622}
1617 1623
1618sub get_text { 1624sub get_text {
1619 $_[0]{text} 1625 $_[0]{text}
1620} 1626}
… …
1653 } elsif ($uni) { 1659 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1655 } 1661 }
1656 1662
1657 $self->_set_text ($text); 1663 $self->_set_text ($text);
1658 $self->update; 1664
1659 $self->check_size; 1665 $self->realloc;
1660} 1666}
1661 1667
1662sub focus_in { 1668sub focus_in {
1663 my ($self) = @_; 1669 my ($self) = @_;
1664 1670
… …
2171 $self->update; 2177 $self->update;
2172 2178
2173 $self 2179 $self
2174} 2180}
2175 2181
2182sub changed { }
2183
2176sub set_range { 2184sub set_range {
2177 my ($self, $range) = @_; 2185 my ($self, $range) = @_;
2178 2186
2179 ($range, $self->{range}) = ($self->{range}, $range); 2187 ($range, $self->{range}) = ($self->{range}, $range);
2180 2188
… …
2369 $self->{fontsize} = $fontsize; 2377 $self->{fontsize} = $fontsize;
2370 $self->reflow; 2378 $self->reflow;
2371} 2379}
2372 2380
2373sub size_allocate { 2381sub size_allocate {
2374 my ($self, $w, $h) = @_; 2382 my ($self, $w, $h, $changed) = @_;
2375 2383
2376 $self->SUPER::size_allocate ($w, $h); 2384 $self->SUPER::size_allocate ($w, $h, $changed);
2385
2386 return unless $changed;
2377 2387
2378 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2388 $self->{layout}->set_font ($self->{font}) if $self->{font};
2379 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2380 $self->{layout}->set_width ($self->{children}[0]{w}); 2390 $self->{layout}->set_width ($self->{children}[0]{w});
2381 2391
… …
2570 2580
2571sub new { 2581sub new {
2572 my $class = shift; 2582 my $class = shift;
2573 2583
2574 my $self = $class->SUPER::new ( 2584 my $self = $class->SUPER::new (
2575 state => 0, 2585 state => 0,
2576 connect_activate => \&toggle_flopper, 2586 on_activate => \&toggle_flopper,
2577 @_ 2587 @_
2578 ); 2588 );
2579 2589
2580 if ($self->{state}) {
2581 $self->{state} = 0;
2582 $self->toggle_flopper;
2583 }
2584
2585 $self 2590 $self
2586} 2591}
2587 2592
2588sub toggle_flopper { 2593sub toggle_flopper {
2589 my ($self) = @_; 2594 my ($self) = @_;
2590 2595
2591 # TODO: use animation 2596 $self->{other}->toggle_visibility;
2592 if ($self->{state} = !$self->{state}) {
2593 $CFClient::UI::ROOT->add ($self->{other});
2594 $self->{other}->move ($self->coord2global (0, $self->{h}));
2595 $self->_emit ("open");
2596 } else {
2597 $CFClient::UI::ROOT->remove ($self->{other});
2598 $self->_emit ("close");
2599 }
2600
2601 $self->_emit (changed => $self->{state});
2602} 2597}
2603 2598
2604############################################################################# 2599#############################################################################
2605 2600
2606package CFClient::UI::Tooltip; 2601package CFClient::UI::Tooltip;
… …
2638 2633
2639 ($w + 4, $h + 4) 2634 ($w + 4, $h + 4)
2640} 2635}
2641 2636
2642sub size_allocate { 2637sub size_allocate {
2643 my ($self, $w, $h) = @_; 2638 my ($self, $w, $h, $changed) = @_;
2644 2639
2640 return unless $changed;
2641
2645 $self->SUPER::size_allocate ($w - 4, $h - 4); 2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2646} 2643}
2647 2644
2648sub _draw { 2645sub _draw {
2649 my ($self) = @_; 2646 my ($self) = @_;
2650 2647
… …
2790 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2791 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2792 2789
2793 $row++; 2790 $row++;
2794 } 2791 }
2795}
2796
2797sub size_request {
2798 my ($self) = @_;
2799 ($self->{req_w}, $self->{req_h});
2800} 2792}
2801 2793
2802############################################################################# 2794#############################################################################
2803 2795
2804package CFClient::UI::Menu; 2796package CFClient::UI::Menu;
… …
2990use CFClient::OpenGL; 2982use CFClient::OpenGL;
2991 2983
2992sub new { 2984sub new {
2993 my $class = shift; 2985 my $class = shift;
2994 2986
2995 $class->SUPER::new ( 2987 my $self = $class->SUPER::new (
2996 visible => 1, 2988 visible => 1,
2997 @_, 2989 @_,
2998 ) 2990 );
2991
2992 Scalar::Util::weaken ($self->{root} = $self);
2993
2994 $self
2999} 2995}
3000 2996
3001sub configure { 2997sub configure {
3002 my ($self, $x, $y, $w, $h) = @_; 2998 my ($self, $x, $y, $w, $h) = @_;
3003 2999
3004 $self->{w} = $w; 3000 $self->{w} = $w;
3005 $self->{h} = $h; 3001 $self->{h} = $h;
3006} 3002}
3007 3003
3008sub check_size { 3004sub reconfigure {
3009 my ($self) = @_; 3005 my ($self) = @_;
3010 3006
3007 $self->SUPER::reconfigure;
3008
3011 $self->size_allocate ($self->{w}, $self->{h}) 3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
3012 if $self->{w}; 3010 if $self->{w};
3013} 3011}
3014 3012
3015sub size_request { 3013sub size_request {
3016 my ($self) = @_; 3014 my ($self) = @_;
3017 3015
3018 ($self->{w}, $self->{h}) 3016 ($self->{w}, $self->{h})
3019} 3017}
3020 3018
3021sub size_allocate { 3019sub size_allocate {
3022 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h, $changed) = @_;
3023 3021
3024 for my $child ($self->children) { 3022 for my $child ($self->children) {
3025 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)};
3026 3024
3027 $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
3028 if exists $child->{req_x}; 3026 if exists $child->{req_x};
3029 3027
3030 $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
3031 if exists $child->{req_y}; 3029 if exists $child->{req_y};
3032 3030
3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3033 $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;
3034 $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;
3035 3035
3036 $child->configure ($X, $Y, $W, $H); 3036 $child->configure ($X, $Y, $W, $H);
3037 } 3037 }
… …
3050} 3050}
3051 3051
3052sub update { 3052sub update {
3053 my ($self) = @_; 3053 my ($self) = @_;
3054 3054
3055 $self->check_size;
3056 $::WANT_REFRESH++; 3055 $::WANT_REFRESH++;
3057} 3056}
3058 3057
3059sub add { 3058sub add {
3060 my ($self, @children) = @_; 3059 my ($self, @children) = @_;
3061
3062 for (my @widgets = @children; my $w = pop @widgets; ) {
3063 push @widgets, $w->children;
3064 $w->{root} = $self;
3065 $w->{visible} = $self->{visible} + 1;
3066 }
3067 3060
3068 for my $child (@children) { 3061 for my $child (@children) {
3069 $child->{is_toplevel} = 1; 3062 $child->{is_toplevel} = 1;
3070 3063
3071 # integerise window positions 3064 # integerise window positions
… …
3106 while ($self->{refresh_hook}) { 3099 while ($self->{refresh_hook}) {
3107 $_->() 3100 $_->()
3108 for values %{delete $self->{refresh_hook}}; 3101 for values %{delete $self->{refresh_hook}};
3109 } 3102 }
3110 3103
3111 if ($self->{check_size}) { 3104 if ($self->{realloc}) {
3112 my @queue = ([], []); 3105 my @queue;
3113 3106
3114 for (;;) { 3107 while () {
3115 if ($self->{check_size}) { 3108 if ($self->{realloc}) {
3116 # heuristic: check containers last 3109 #TODO use array-of-depth approach
3117 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3110
3118 for values %{delete $self->{check_size}} 3111 @queue = sort { $a->{visible} <=> $b->{visible} }
3112 @queue, values %{delete $self->{realloc}};
3119 } 3113 }
3120 3114
3121 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3115 my $widget = pop @queue || last;
3122 3116
3117 $widget->{visible} or last; # do not resize invisible widgets
3118
3123 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3124 ? @$widget{qw(user_w user_h)} 3120 ? @$widget{qw(def_w def_h)}
3125 : $widget->size_request; 3121 : $widget->size_request;
3126 3122
3127 if (delete $widget->{force_alloc}
3128 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3129 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#
3130 3124
3131 $widget->{req_w} = $w; 3125 $widget->{req_w} = $w;
3132 $widget->{req_h} = $h; 3126 $widget->{req_h} = $h;
3133 3127
3134 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3135 3129
3136 $widget->{parent}->check_size 3130 push @queue, $widget->{parent}
3137 if $widget->{parent}; 3131 if $widget->{parent};
3138 }
3139 } 3132 }
3140 } 3133 }
3141 3134
3142 while ($self->{size_alloc}) { 3135 while (my $size_alloc = delete $self->{size_alloc}) {
3143 for (values %{delete $self->{size_alloc}}) { 3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3144 my ($widget, $w, $h) = @$_; 3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
3145 3141
3146 $w = 0 if $w < 0; 3142 $w = 0 if $w < 0;
3147 $h = 0 if $h < 0; 3143 $h = 0 if $h < 0;
3148 3144
3149 $widget->{w} = $w; 3145 $widget->{w} = $w;
3150 $widget->{h} = $h; 3146 $widget->{h} = $h;
3151 $widget->emit (size_allocate => $w, $h); 3147 $widget->emit (size_allocate => $w, $h, 1);
3152 } 3148 }
3153 } 3149 }
3154 3150
3155 while ($self->{post_alloc_hook}) { 3151 while ($self->{post_alloc_hook}) {
3156 $_->() 3152 $_->()

Diff Legend

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