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

Diff Legend

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