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.244 by root, Sat May 27 21:06:09 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} 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 return unless $self->{visible}; 270 return unless $self->{visible};
259 271
260 # broken show/hide model 272 $_->set_invisible for $self->children;
261 273
262 delete $self->{root}; 274 delete $self->{root};
263 delete $self->{visible}; 275 delete $self->{visible};
264 276
265 undef $GRAB if $GRAB == $self; 277 undef $GRAB if $GRAB == $self;
266 undef $HOVER if $HOVER == $self; 278 undef $HOVER if $HOVER == $self;
267 279
268 CFClient::UI::check_tooltip 280 CFClient::UI::check_tooltip
269 if $CFClient::UI::TOOLTIP->{owner} == $self; 281 if $TOOLTIP->{owner} == $self;
270 282
271 $self->focus_out; 283 $self->focus_out;
272 284
273 $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;
274} 303}
275 304
276sub hide { 305sub hide {
277 my ($self) = @_; 306 my ($self) = @_;
278 307
… …
293} 322}
294 323
295sub set_size { 324sub set_size {
296 my ($self, $w, $h) = @_; 325 my ($self, $w, $h) = @_;
297 326
298 $self->{user_w} = $w; 327 $self->{def_w} = $w;
299 $self->{user_h} = $h; 328 $self->{def_h} = $h;
300 329
301 $self->check_size; 330 $self->realloc;
302} 331}
303 332
304sub size_request { 333sub size_request {
305 require Carp; 334 require Carp;
306 Carp::confess "size_request is abstract"; 335 Carp::confess "size_request is abstract";
… …
326 $self->{y} = $y; 355 $self->{y} = $y;
327 $self->update; 356 $self->update;
328 } 357 }
329 358
330 if ($self->{w} != $w || $self->{h} != $h) { 359 if ($self->{w} != $w || $self->{h} != $h) {
360 return unless $self->{visible};
361
331 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
332 } 363 }
333} 364}
334 365
335sub size_allocate { 366sub size_allocate {
336 # nothing to be done 367 # nothing to be done
337}
338
339sub reconfigure {
340 my ($self) = @_;
341
342 $self->check_size (1);
343 $self->update;
344} 368}
345 369
346sub children { 370sub children {
347} 371}
348 372
… …
426sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
427sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
428sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
429sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
430sub 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}
431 518
432sub draw { 519sub draw {
433 my ($self) = @_; 520 my ($self) = @_;
434 521
435 return unless $self->{h} && $self->{w}; 522 return unless $self->{h} && $self->{w};
… …
473 my ($self) = @_; 560 my ($self) = @_;
474 561
475 warn "no draw defined for $self\n"; 562 warn "no draw defined for $self\n";
476} 563}
477 564
478sub find_widget {
479 my ($self, $x, $y) = @_;
480
481 return () unless $self->{can_events};
482
483 return $self
484 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
485 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
486
487 ()
488}
489
490sub set_parent {
491 my ($self, $parent) = @_;
492
493 Scalar::Util::weaken ($self->{parent} = $parent);
494
495 if ($parent->{visible} || 1) {
496 $self->{root} = $parent->{root};
497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
502
503 # TODO: req_w _does_change after ->reconfigure
504 $self->check_size
505 unless exists $self->{req_w};
506
507 $self->show;
508}
509
510sub check_size {
511 my ($self, $forced) = @_;
512
513 $self->{force_alloc} = 1 if $forced;
514 $CFClient::UI::ROOT->{check_size}{$self} = $self;
515}
516
517sub update {
518 my ($self) = @_;
519
520 $self->{parent}->update
521 if $self->{parent};
522}
523
524sub connect {
525 my ($self, $signal, $cb) = @_;
526
527 push @{ $self->{signal_cb}{$signal} }, $cb;
528}
529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
536sub emit {
537 my ($self, $signal, @args) = @_;
538
539 $self->_emit ($signal, @args)
540 || $self->$signal (@args);
541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
545}
546
547sub DESTROY { 565sub DESTROY {
548 my ($self) = @_; 566 my ($self) = @_;
549 567
550 delete $WIDGET{$self+0}; 568 delete $WIDGET{$self+0};
551 #$self->deactivate; 569 #$self->deactivate;
… …
646 $self->{children} = [ 664 $self->{children} = [
647 sort { $a->{z} <=> $b->{z} } 665 sort { $a->{z} <=> $b->{z} }
648 @{$self->{children}}, @widgets 666 @{$self->{children}}, @widgets
649 ]; 667 ];
650 668
651 $self->check_size (1); 669 $self->realloc;
652 $self->update;
653} 670}
654 671
655sub children { 672sub children {
656 @{ $_[0]{children} } 673 @{ $_[0]{children} }
657} 674}
… …
662 delete $child->{parent}; 679 delete $child->{parent};
663 $child->hide; 680 $child->hide;
664 681
665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 682 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
666 683
667 $self->check_size (1); 684 $self->realloc;
668 $self->update;
669} 685}
670 686
671sub clear { 687sub clear {
672 my ($self) = @_; 688 my ($self) = @_;
673 689
… …
677 for (@$children) { 693 for (@$children) {
678 delete $_->{parent}; 694 delete $_->{parent};
679 $_->hide; 695 $_->hide;
680 } 696 }
681 697
682 $self->check_size; 698 $self->realloc;
683 $self->update;
684} 699}
685 700
686sub find_widget { 701sub find_widget {
687 my ($self, $x, $y) = @_; 702 my ($self, $x, $y) = @_;
688 703
… …
741sub size_request { 756sub size_request {
742 $_[0]{children}[0]->size_request 757 $_[0]{children}[0]->size_request
743} 758}
744 759
745sub size_allocate { 760sub size_allocate {
746 my ($self, $w, $h) = @_; 761 my ($self, $w, $h, $changed) = @_;
747 762
748 $self->{children}[0]->configure (0, 0, $w, $h); 763 $self->{children}[0]->configure (0, 0, $w, $h);
749} 764}
750 765
751############################################################################# 766#############################################################################
… …
768 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 783 $ROOT->on_post_alloc ($self => sub { $self->render_child });
769 $self->SUPER::update; 784 $self->SUPER::update;
770} 785}
771 786
772sub size_allocate { 787sub size_allocate {
773 my ($self, $w, $h) = @_; 788 my ($self, $w, $h, $changed) = @_;
774 789
775 $self->SUPER::size_allocate ($w, $h); 790 $self->SUPER::size_allocate ($w, $h, $changed);
776 $self->update; 791 $self->update
792 if $changed;
777} 793}
778 794
779sub _render { 795sub _render {
780 $_[0]{children}[0]->draw; 796 $_[0]{children}[0]->draw;
781} 797}
… …
825} 841}
826 842
827sub size_request { 843sub size_request {
828 my ($self) = @_; 844 my ($self) = @_;
829 845
830 @$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)};
831 847
832 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
833} 852}
834 853
835sub size_allocate { 854sub size_allocate {
836 my ($self, $w, $h) = @_; 855 my ($self, $w, $h, $changed) = @_;
837 856
838 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
839 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
840 859
841 $self->child->configure (0, 0, $w, $h); 860 $self->child->configure (0, 0, $w, $h);
… …
928 my $child = $self->{vp}->child; 947 my $child = $self->{vp}->child;
929 $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]);
930} 949}
931 950
932sub size_allocate { 951sub size_allocate {
933 my ($self, $w, $h) = @_; 952 my ($self, $w, $h, $changed) = @_;
934 953
935 $self->SUPER::size_allocate ($w, $h); 954 $self->SUPER::size_allocate ($w, $h, $changed);
936 955
937 my $child = $self->{vp}->child; 956 my $child = $self->{vp}->child;
938 $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]);
939} 958}
940 959
… …
993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
994 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);
995 1014
996sub new { 1015sub new {
997 my $class = shift; 1016 my $class = shift;
998
999 # TODO: user_x, user_y, overwrite moveto?
1000 1017
1001 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
1002 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
1003 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
1004 border => 0.6, 1021 border => 0.6,
… …
1030 $h + $self->border * 2, 1047 $h + $self->border * 2,
1031 ) 1048 )
1032} 1049}
1033 1050
1034sub size_allocate { 1051sub size_allocate {
1035 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h, $changed) = @_;
1053
1054 return unless $changed;
1036 1055
1037 $h -= List::Util::max 0, $self->border * 2; 1056 $h -= List::Util::max 0, $self->border * 2;
1038 $w -= List::Util::max 0, $self->border * 2; 1057 $w -= List::Util::max 0, $self->border * 2;
1039 1058
1040 $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)
… …
1066 my $dx = $ev->{x} - $ox; 1085 my $dx = $ev->{x} - $ox;
1067 my $dy = $ev->{y} - $oy; 1086 my $dy = $ev->{y} - $oy;
1068 1087
1069 $self->{user_x} = $wx + $dx * $mx; 1088 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my; 1089 $self->{user_y} = $wy + $dy * $my;
1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1073 $self->move ($self->{user_x}, $self->{user_y}); 1092 $self->move ($self->{user_x}, $self->{user_y});
1074 $self->check_size; 1093 $self->realloc;
1075 }; 1094 };
1076 1095
1077 } elsif ($lr ^ $td) { 1096 } elsif ($lr ^ $td) {
1078 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1097 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1079 my ($bx, $by) = ($self->{x}, $self->{y}); 1098 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1083 1102
1084 ($x, $y) = ($ev->{x}, $ev->{y}); 1103 ($x, $y) = ($ev->{x}, $ev->{y});
1085 1104
1086 $self->{user_x} = $bx + $x - $ox; 1105 $self->{user_x} = $bx + $x - $ox;
1087 $self->{user_y} = $by + $y - $oy; 1106 $self->{user_y} = $by + $y - $oy;
1107
1088 $self->move ($self->{user_x}, $self->{user_y}); 1108 $self->move ($self->{user_x}, $self->{user_y});
1089 $self->update; 1109 $self->realloc;
1090 }; 1110 };
1091 } 1111 }
1092} 1112}
1093 1113
1094sub button_up { 1114sub button_up {
… …
1169 my ($self, $x, $y, $child) = @_; 1189 my ($self, $x, $y, $child) = @_;
1170 1190
1171 $child->set_parent ($self); 1191 $child->set_parent ($self);
1172 $self->{children}[$y][$x] = $child; 1192 $self->{children}[$y][$x] = $child;
1173 1193
1174 $self->check_size (1); 1194 $self->realloc;
1175} 1195}
1176 1196
1177# 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?
1178sub clear { 1198sub clear {
1179 my ($self) = @_; 1199 my ($self) = @_;
… …
1184 for (@children) { 1204 for (@children) {
1185 delete $_->{parent}; 1205 delete $_->{parent};
1186 $_->hide; 1206 $_->hide;
1187 } 1207 }
1188 1208
1189 $self->check_size (1); 1209 $self->realloc;
1190 $self->update;
1191} 1210}
1192 1211
1193sub get_wh { 1212sub get_wh {
1194 my ($self) = @_; 1213 my ($self) = @_;
1195 1214
… …
1222 (sum @$hs), 1241 (sum @$hs),
1223 ) 1242 )
1224} 1243}
1225 1244
1226sub size_allocate { 1245sub size_allocate {
1227 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h, $changed) = @_;
1228 1247
1229 my ($ws, $hs) = $self->get_wh; 1248 my ($ws, $hs) = $self->get_wh;
1230 1249
1231 my $req_w = (sum @$ws) || 1; 1250 my $req_w = (sum @$ws) || 1;
1232 my $req_h = (sum @$hs) || 1; 1251 my $req_h = (sum @$hs) || 1;
… …
1291 } 1310 }
1292} 1311}
1293 1312
1294############################################################################# 1313#############################################################################
1295 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
1296package CFClient::UI::HBox; 1375package CFClient::UI::HBox;
1297 1376
1298# TODO: wrap into common Box base class
1299
1300our @ISA = CFClient::UI::Container::; 1377our @ISA = CFClient::UI::Box::;
1301 1378
1302sub size_request { 1379sub new {
1303 my ($self) = @_; 1380 my $class = shift;
1304 1381
1305 my @alloc = map [$_->size_request], @{$self->{children}}; 1382 $class->SUPER::new (
1306 1383 vertical => 0,
1307 ( 1384 @_,
1308 (List::Util::sum map $_->[0], @alloc),
1309 (List::Util::max map $_->[1], @alloc),
1310 ) 1385 )
1311} 1386}
1312 1387
1313sub size_allocate {
1314 my ($self, $w, $h) = @_;
1315
1316 ($h, $w) = ($w, $h);
1317
1318 my $children = $self->{children};
1319
1320 my @h = map $_->{req_w}, @$children;
1321
1322 my $req_h = List::Util::sum @h;
1323
1324 if ($req_h > $h) {
1325 # ah well, not enough space
1326 $_ *= $h / $req_h for @h;
1327 } else {
1328 my $exp = List::Util::sum map $_->{expand}, @$children;
1329 $exp ||= 1;
1330
1331 for (0 .. $#$children) {
1332 my $child = $children->[$_];
1333
1334 my $alloc_h = $h[$_];
1335 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1336 $h[$_] = $alloc_h;
1337 }
1338 }
1339
1340 CFClient::UI::harmonize \@h;
1341
1342 my $y = 0;
1343 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_];
1346 $child->configure ($y, 0, $h, $w);
1347
1348 $y += $h;
1349 }
1350
1351 1
1352}
1353
1354############################################################################# 1388#############################################################################
1355 1389
1356package CFClient::UI::VBox; 1390package CFClient::UI::VBox;
1357 1391
1358# TODO: wrap into common Box base class
1359
1360our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Box::;
1361 1393
1362sub size_request { 1394sub new {
1363 my ($self) = @_; 1395 my $class = shift;
1364 1396
1365 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $class->SUPER::new (
1366 1398 vertical => 1,
1367 ( 1399 @_,
1368 (List::Util::max map $_->[0], @alloc),
1369 (List::Util::sum map $_->[1], @alloc),
1370 ) 1400 )
1371}
1372
1373sub size_allocate {
1374 my ($self, $w, $h) = @_;
1375
1376 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1377
1378 my $children = $self->{children};
1379
1380 my @h = map $_->{req_h}, @$children;
1381
1382 my $req_h = List::Util::sum @h;
1383
1384 if ($req_h > $h) {
1385 # ah well, not enough space
1386 $_ *= $h / $req_h for @h;
1387 } else {
1388 my $exp = List::Util::sum map $_->{expand}, @$children;
1389 $exp ||= 1;
1390
1391 for (0 .. $#$children) {
1392 my $child = $children->[$_];
1393
1394 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1395 }
1396 }
1397
1398 CFClient::UI::harmonize \@h;
1399
1400 my $y = 0;
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403 my $h = $h[$_];
1404 $child->configure (0, $y, $w, $h);
1405
1406 $y += $h;
1407 }
1408
1409 1
1410} 1401}
1411 1402
1412############################################################################# 1403#############################################################################
1413 1404
1414package CFClient::UI::Label; 1405package CFClient::UI::Label;
… …
1477 $self->{text} = "T$text"; 1468 $self->{text} = "T$text";
1478 1469
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1471 $self->{layout}->set_text ($text);
1481 1472
1482 $self->update; 1473 $self->realloc;
1483 $self->check_size;
1484} 1474}
1485 1475
1486sub set_markup { 1476sub set_markup {
1487 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1488 1478
… …
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1483
1494 $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;
1495 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1496 1486
1497 $self->update; 1487 $self->realloc;
1498 $self->check_size;
1499} 1488}
1500 1489
1501sub size_request { 1490sub size_request {
1502 my ($self) = @_; 1491 my ($self) = @_;
1503 1492
… …
1524 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1525 ) 1514 )
1526} 1515}
1527 1516
1528sub size_allocate { 1517sub size_allocate {
1529 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1530 1519
1531 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1532} 1522}
1533 1523
1534sub set_fontsize { 1524sub set_fontsize {
1535 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1536 1526
1537 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1538 delete $self->{texture}; 1528 delete $self->{texture};
1539 1529
1540 $self->update; 1530 $self->realloc;
1541 $self->check_size;
1542} 1531}
1543 1532
1544sub _draw { 1533sub _draw {
1545 my ($self) = @_; 1534 my ($self) = @_;
1546 1535
… …
1626sub set_text { 1615sub set_text {
1627 my ($self, $text) = @_; 1616 my ($self, $text) = @_;
1628 1617
1629 $self->{cursor} = length $text; 1618 $self->{cursor} = length $text;
1630 $self->_set_text ($text); 1619 $self->_set_text ($text);
1631 $self->update; 1620
1632 $self->check_size; 1621 $self->realloc;
1633} 1622}
1634 1623
1635sub get_text { 1624sub get_text {
1636 $_[0]{text} 1625 $_[0]{text}
1637} 1626}
… …
1670 } elsif ($uni) { 1659 } elsif ($uni) {
1671 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1672 } 1661 }
1673 1662
1674 $self->_set_text ($text); 1663 $self->_set_text ($text);
1675 $self->update; 1664
1676 $self->check_size; 1665 $self->realloc;
1677} 1666}
1678 1667
1679sub focus_in { 1668sub focus_in {
1680 my ($self) = @_; 1669 my ($self) = @_;
1681 1670
… …
2188 $self->update; 2177 $self->update;
2189 2178
2190 $self 2179 $self
2191} 2180}
2192 2181
2182sub changed { }
2183
2193sub set_range { 2184sub set_range {
2194 my ($self, $range) = @_; 2185 my ($self, $range) = @_;
2195 2186
2196 ($range, $self->{range}) = ($self->{range}, $range); 2187 ($range, $self->{range}) = ($self->{range}, $range);
2197 2188
… …
2386 $self->{fontsize} = $fontsize; 2377 $self->{fontsize} = $fontsize;
2387 $self->reflow; 2378 $self->reflow;
2388} 2379}
2389 2380
2390sub size_allocate { 2381sub size_allocate {
2391 my ($self, $w, $h) = @_; 2382 my ($self, $w, $h, $changed) = @_;
2392 2383
2393 $self->SUPER::size_allocate ($w, $h); 2384 $self->SUPER::size_allocate ($w, $h, $changed);
2385
2386 return unless $changed;
2394 2387
2395 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2388 $self->{layout}->set_font ($self->{font}) if $self->{font};
2396 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $self->{layout}->set_width ($self->{children}[0]{w}); 2390 $self->{layout}->set_width ($self->{children}[0]{w});
2398 2391
… …
2592 state => 0, 2585 state => 0,
2593 on_activate => \&toggle_flopper, 2586 on_activate => \&toggle_flopper,
2594 @_ 2587 @_
2595 ); 2588 );
2596 2589
2597 if ($self->{state}) {
2598 $self->{state} = 0;
2599 $self->toggle_flopper;
2600 }
2601
2602 $self 2590 $self
2603} 2591}
2604 2592
2605sub toggle_flopper { 2593sub toggle_flopper {
2606 my ($self) = @_; 2594 my ($self) = @_;
2607 2595
2608 # TODO: use animation 2596 $self->{other}->toggle_visibility;
2609 if ($self->{state} = !$self->{state}) {
2610 $CFClient::UI::ROOT->add ($self->{other});
2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2612 $self->_emit ("open");
2613 } else {
2614 $CFClient::UI::ROOT->remove ($self->{other});
2615 $self->_emit ("close");
2616 }
2617
2618 $self->_emit (changed => $self->{state});
2619} 2597}
2620 2598
2621############################################################################# 2599#############################################################################
2622 2600
2623package CFClient::UI::Tooltip; 2601package CFClient::UI::Tooltip;
… …
2655 2633
2656 ($w + 4, $h + 4) 2634 ($w + 4, $h + 4)
2657} 2635}
2658 2636
2659sub size_allocate { 2637sub size_allocate {
2660 my ($self, $w, $h) = @_; 2638 my ($self, $w, $h, $changed) = @_;
2661 2639
2640 return unless $changed;
2641
2662 $self->SUPER::size_allocate ($w - 4, $h - 4); 2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2663} 2643}
2664 2644
2665sub _draw { 2645sub _draw {
2666 my ($self) = @_; 2646 my ($self) = @_;
2667 2647
… …
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809 2789
2810 $row++; 2790 $row++;
2811 } 2791 }
2812}
2813
2814sub size_request {
2815 my ($self) = @_;
2816 ($self->{req_w}, $self->{req_h});
2817} 2792}
2818 2793
2819############################################################################# 2794#############################################################################
2820 2795
2821package CFClient::UI::Menu; 2796package CFClient::UI::Menu;
… …
3007use CFClient::OpenGL; 2982use CFClient::OpenGL;
3008 2983
3009sub new { 2984sub new {
3010 my $class = shift; 2985 my $class = shift;
3011 2986
3012 $class->SUPER::new ( 2987 my $self = $class->SUPER::new (
3013 visible => 1, 2988 visible => 1,
3014 @_, 2989 @_,
3015 ) 2990 );
2991
2992 Scalar::Util::weaken ($self->{root} = $self);
2993
2994 $self
3016} 2995}
3017 2996
3018sub configure { 2997sub configure {
3019 my ($self, $x, $y, $w, $h) = @_; 2998 my ($self, $x, $y, $w, $h) = @_;
3020 2999
3021 $self->{w} = $w; 3000 $self->{w} = $w;
3022 $self->{h} = $h; 3001 $self->{h} = $h;
3023} 3002}
3024 3003
3025sub check_size { 3004sub reconfigure {
3026 my ($self) = @_; 3005 my ($self) = @_;
3027 3006
3007 $self->SUPER::reconfigure;
3008
3028 $self->size_allocate ($self->{w}, $self->{h}) 3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
3029 if $self->{w}; 3010 if $self->{w};
3030} 3011}
3031 3012
3032sub size_request { 3013sub size_request {
3033 my ($self) = @_; 3014 my ($self) = @_;
3034 3015
3035 ($self->{w}, $self->{h}) 3016 ($self->{w}, $self->{h})
3036} 3017}
3037 3018
3038sub size_allocate { 3019sub size_allocate {
3039 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h, $changed) = @_;
3040 3021
3041 for my $child ($self->children) { 3022 for my $child ($self->children) {
3042 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)};
3043 3024
3044 $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
3045 if exists $child->{req_x}; 3026 if exists $child->{req_x};
3046 3027
3047 $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
3048 if exists $child->{req_y}; 3029 if exists $child->{req_y};
3049 3030
3050 $X = $self->{user_x} if exists $self->{user_x}; 3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052 3032
3053 $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;
3054 $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;
3055 3035
3056 $child->configure ($X, $Y, $W, $H); 3036 $child->configure ($X, $Y, $W, $H);
… …
3070} 3050}
3071 3051
3072sub update { 3052sub update {
3073 my ($self) = @_; 3053 my ($self) = @_;
3074 3054
3075 $self->check_size;
3076 $::WANT_REFRESH++; 3055 $::WANT_REFRESH++;
3077} 3056}
3078 3057
3079sub add { 3058sub add {
3080 my ($self, @children) = @_; 3059 my ($self, @children) = @_;
3081
3082 for (my @widgets = @children; my $w = pop @widgets; ) {
3083 push @widgets, $w->children;
3084 $w->{root} = $self;
3085 $w->{visible} = $self->{visible} + 1;
3086 }
3087 3060
3088 for my $child (@children) { 3061 for my $child (@children) {
3089 $child->{is_toplevel} = 1; 3062 $child->{is_toplevel} = 1;
3090 3063
3091 # integerise window positions 3064 # integerise window positions
… …
3126 while ($self->{refresh_hook}) { 3099 while ($self->{refresh_hook}) {
3127 $_->() 3100 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3101 for values %{delete $self->{refresh_hook}};
3129 } 3102 }
3130 3103
3131 if ($self->{check_size}) { 3104 if ($self->{realloc}) {
3132 my @queue; 3105 my @queue;
3133 3106
3134 for (;;) { 3107 while () {
3135 if ($self->{check_size}) { 3108 if ($self->{realloc}) {
3136 #TODO use array-of-depth approach 3109 #TODO use array-of-depth approach
3137 3110
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3111 @queue = sort { $a->{visible} <=> $b->{visible} }
3139 @queue, values %{delete $self->{check_size}}; 3112 @queue, values %{delete $self->{realloc}};
3140 } 3113 }
3141 3114
3142 my $widget = pop @queue || last; 3115 my $widget = pop @queue || last;
3143 3116
3144 defined $widget->{visible} or last; # do not resize invisible widgets 3117 $widget->{visible} or last; # do not resize invisible widgets
3145 3118
3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3147 ? @$widget{qw(user_w user_h)} 3120 ? @$widget{qw(def_w def_h)}
3148 : $widget->size_request; 3121 : $widget->size_request;
3149 3122
3150 if (delete $widget->{force_alloc}
3151 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3152 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#
3153 3124
3154 $widget->{req_w} = $w; 3125 $widget->{req_w} = $w;
3155 $widget->{req_h} = $h; 3126 $widget->{req_h} = $h;
3156 3127
3157 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3158 3129
3159 $widget->{parent}->check_size 3130 push @queue, $widget->{parent}
3160 if $widget->{parent}; 3131 if $widget->{parent};
3161 }
3162 } 3132 }
3163 } 3133 }
3164 3134
3165 while ($self->{size_alloc}) { 3135 while (my $size_alloc = delete $self->{size_alloc}) {
3166 for (values %{delete $self->{size_alloc}}) { 3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3167 my ($widget, $w, $h) = @$_; 3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
3168 3141
3169 $w = 0 if $w < 0; 3142 $w = 0 if $w < 0;
3170 $h = 0 if $h < 0; 3143 $h = 0 if $h < 0;
3171 3144
3172 $widget->{w} = $w; 3145 $widget->{w} = $w;
3173 $widget->{h} = $h; 3146 $widget->{h} = $h;
3174 $widget->emit (size_allocate => $w, $h); 3147 $widget->emit (size_allocate => $w, $h, 1);
3175 } 3148 }
3176 } 3149 }
3177 3150
3178 while ($self->{post_alloc_hook}) { 3151 while ($self->{post_alloc_hook}) {
3179 $_->() 3152 $_->()

Diff Legend

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