ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.253 by root, Sun May 28 23:28:12 2006 UTC

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

Diff Legend

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