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.245 by elmex, Sat May 27 21:15:57 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}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
236} 222}
237 223
238sub destroy { 224sub destroy {
239 my ($self) = @_; 225 my ($self) = @_;
240 226
… …
242 %$self = (); 228 %$self = ();
243} 229}
244 230
245sub show { 231sub show {
246 my ($self) = @_; 232 my ($self) = @_;
233
247 return if $self->{parent}; 234 return if $self->{parent};
248 235
249 $CFClient::UI::ROOT->add ($self); 236 $CFClient::UI::ROOT->add ($self);
250} 237}
251 238
252sub show_centered { 239sub center {
253 my ($self) = @_; 240 my ($self) = @_;
254 return if $self->{parent};
255
256 $self->show;
257 241
258 $CFClient::UI::ROOT->on_post_alloc ( 242 $CFClient::UI::ROOT->on_post_alloc (
259 "centered $self" => sub { 243 "center_$self" => sub {
260 $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);
261 }, 245 },
262 ); 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;
263} 264}
264 265
265sub set_invisible { 266sub set_invisible {
266 my ($self) = @_; 267 my ($self) = @_;
267 268
268 return unless $self->{visible}; 269 return unless $self->{visible};
269 270
270 # broken show/hide model 271 $_->set_invisible for $self->children;
271 272
272 delete $self->{root}; 273 delete $self->{root};
273 delete $self->{visible}; 274 delete $self->{visible};
274 275
275 undef $GRAB if $GRAB == $self; 276 undef $GRAB if $GRAB == $self;
276 undef $HOVER if $HOVER == $self; 277 undef $HOVER if $HOVER == $self;
277 278
278 CFClient::UI::check_tooltip 279 CFClient::UI::check_tooltip
279 if $CFClient::UI::TOOLTIP->{owner} == $self; 280 if $TOOLTIP->{owner} == $self;
280 281
281 $self->focus_out; 282 $self->focus_out;
282 283
283 $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;
284} 302}
285 303
286sub hide { 304sub hide {
287 my ($self) = @_; 305 my ($self) = @_;
288 306
… …
303} 321}
304 322
305sub set_size { 323sub set_size {
306 my ($self, $w, $h) = @_; 324 my ($self, $w, $h) = @_;
307 325
308 $self->{user_w} = $w; 326 $self->{def_w} = $w;
309 $self->{user_h} = $h; 327 $self->{def_h} = $h;
310 328
311 $self->check_size; 329 $self->realloc;
312} 330}
313 331
314sub size_request { 332sub size_request {
315 require Carp; 333 require Carp;
316 Carp::confess "size_request is abstract"; 334 Carp::confess "size_request is abstract";
… …
336 $self->{y} = $y; 354 $self->{y} = $y;
337 $self->update; 355 $self->update;
338 } 356 }
339 357
340 if ($self->{w} != $w || $self->{h} != $h) { 358 if ($self->{w} != $w || $self->{h} != $h) {
359 return unless $self->{visible};
360
341 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 361 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
342 } 362 }
343} 363}
344 364
345sub size_allocate { 365sub size_allocate {
346 # nothing to be done 366 # nothing to be done
347}
348
349sub reconfigure {
350 my ($self) = @_;
351
352 $self->check_size (1);
353 $self->update;
354} 367}
355 368
356sub children { 369sub children {
357} 370}
358 371
… …
436sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 449sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
437sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 450sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
438sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 451sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
439sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 452sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
440sub 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}
441 517
442sub draw { 518sub draw {
443 my ($self) = @_; 519 my ($self) = @_;
444 520
445 return unless $self->{h} && $self->{w}; 521 return unless $self->{h} && $self->{w};
… …
483 my ($self) = @_; 559 my ($self) = @_;
484 560
485 warn "no draw defined for $self\n"; 561 warn "no draw defined for $self\n";
486} 562}
487 563
488sub find_widget {
489 my ($self, $x, $y) = @_;
490
491 return () unless $self->{can_events};
492
493 return $self
494 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
495 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
496
497 ()
498}
499
500sub set_parent {
501 my ($self, $parent) = @_;
502
503 Scalar::Util::weaken ($self->{parent} = $parent);
504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
513 # TODO: req_w _does_change after ->reconfigure
514 $self->check_size
515 unless exists $self->{req_w};
516
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555}
556
557sub DESTROY { 564sub DESTROY {
558 my ($self) = @_; 565 my ($self) = @_;
559 566
560 delete $WIDGET{$self+0}; 567 delete $WIDGET{$self+0};
561 #$self->deactivate; 568 #$self->deactivate;
… …
656 $self->{children} = [ 663 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 664 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 665 @{$self->{children}}, @widgets
659 ]; 666 ];
660 667
661 $self->check_size (1); 668 $self->realloc;
662 $self->update;
663} 669}
664 670
665sub children { 671sub children {
666 @{ $_[0]{children} } 672 @{ $_[0]{children} }
667} 673}
… …
672 delete $child->{parent}; 678 delete $child->{parent};
673 $child->hide; 679 $child->hide;
674 680
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 682
677 $self->check_size (1); 683 $self->realloc;
678 $self->update;
679} 684}
680 685
681sub clear { 686sub clear {
682 my ($self) = @_; 687 my ($self) = @_;
683 688
… …
687 for (@$children) { 692 for (@$children) {
688 delete $_->{parent}; 693 delete $_->{parent};
689 $_->hide; 694 $_->hide;
690 } 695 }
691 696
692 $self->check_size; 697 $self->realloc;
693 $self->update;
694} 698}
695 699
696sub find_widget { 700sub find_widget {
697 my ($self, $x, $y) = @_; 701 my ($self, $x, $y) = @_;
698 702
… …
751sub size_request { 755sub size_request {
752 $_[0]{children}[0]->size_request 756 $_[0]{children}[0]->size_request
753} 757}
754 758
755sub size_allocate { 759sub size_allocate {
756 my ($self, $w, $h) = @_; 760 my ($self, $w, $h, $changed) = @_;
757 761
758 $self->{children}[0]->configure (0, 0, $w, $h); 762 $self->{children}[0]->configure (0, 0, $w, $h);
759} 763}
760 764
761############################################################################# 765#############################################################################
… …
778 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 782 $ROOT->on_post_alloc ($self => sub { $self->render_child });
779 $self->SUPER::update; 783 $self->SUPER::update;
780} 784}
781 785
782sub size_allocate { 786sub size_allocate {
783 my ($self, $w, $h) = @_; 787 my ($self, $w, $h, $changed) = @_;
784 788
785 $self->SUPER::size_allocate ($w, $h); 789 $self->SUPER::size_allocate ($w, $h, $changed);
786 $self->update; 790 $self->update
791 if $changed;
787} 792}
788 793
789sub _render { 794sub _render {
790 $_[0]{children}[0]->draw; 795 $_[0]{children}[0]->draw;
791} 796}
… …
835} 840}
836 841
837sub size_request { 842sub size_request {
838 my ($self) = @_; 843 my ($self) = @_;
839 844
840 @$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)};
841 846
842 @$self{qw(child_w child_h)} 847 $w = 10 if $self->{scroll_x};
848 $h = 10 if $self->{scroll_y};
849
850 ($w, $h)
843} 851}
844 852
845sub size_allocate { 853sub size_allocate {
846 my ($self, $w, $h) = @_; 854 my ($self, $w, $h, $changed) = @_;
847 855
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 856 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 857 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850 858
851 $self->child->configure (0, 0, $w, $h); 859 $self->child->configure (0, 0, $w, $h);
… …
938 my $child = $self->{vp}->child; 946 my $child = $self->{vp}->child;
939 $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]);
940} 948}
941 949
942sub size_allocate { 950sub size_allocate {
943 my ($self, $w, $h) = @_; 951 my ($self, $w, $h, $changed) = @_;
944 952
945 $self->SUPER::size_allocate ($w, $h); 953 $self->SUPER::size_allocate ($w, $h, $changed);
946 954
947 my $child = $self->{vp}->child; 955 my $child = $self->{vp}->child;
948 $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]);
949} 957}
950 958
… …
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 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);
1005 1013
1006sub new { 1014sub new {
1007 my $class = shift; 1015 my $class = shift;
1008
1009 # TODO: user_x, user_y, overwrite moveto?
1010 1016
1011 my $self = $class->SUPER::new ( 1017 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1018 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1019 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1020 border => 0.6,
… …
1040 $h + $self->border * 2, 1046 $h + $self->border * 2,
1041 ) 1047 )
1042} 1048}
1043 1049
1044sub size_allocate { 1050sub size_allocate {
1045 my ($self, $w, $h) = @_; 1051 my ($self, $w, $h, $changed) = @_;
1052
1053 return unless $changed;
1046 1054
1047 $h -= List::Util::max 0, $self->border * 2; 1055 $h -= List::Util::max 0, $self->border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1056 $w -= List::Util::max 0, $self->border * 2;
1049 1057
1050 $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)
… …
1076 my $dx = $ev->{x} - $ox; 1084 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1085 my $dy = $ev->{y} - $oy;
1078 1086
1079 $self->{user_x} = $wx + $dx * $mx; 1087 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my; 1088 $self->{user_y} = $wy + $dy * $my;
1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1089 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1090 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1091 $self->move ($self->{user_x}, $self->{user_y});
1084 $self->check_size; 1092 $self->realloc;
1085 }; 1093 };
1086 1094
1087 } elsif ($lr ^ $td) { 1095 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1096 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1097 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1093 1101
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1103
1096 $self->{user_x} = $bx + $x - $ox; 1104 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy; 1105 $self->{user_y} = $by + $y - $oy;
1106
1098 $self->move ($self->{user_x}, $self->{user_y}); 1107 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update; 1108 $self->realloc;
1100 }; 1109 };
1101 } 1110 }
1102} 1111}
1103 1112
1104sub button_up { 1113sub button_up {
… …
1179 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
1180 1189
1181 $child->set_parent ($self); 1190 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
1183 1192
1184 $self->check_size (1); 1193 $self->realloc;
1185} 1194}
1186 1195
1187# 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?
1188sub clear { 1197sub clear {
1189 my ($self) = @_; 1198 my ($self) = @_;
… …
1194 for (@children) { 1203 for (@children) {
1195 delete $_->{parent}; 1204 delete $_->{parent};
1196 $_->hide; 1205 $_->hide;
1197 } 1206 }
1198 1207
1199 $self->check_size (1); 1208 $self->realloc;
1200 $self->update;
1201} 1209}
1202 1210
1203sub get_wh { 1211sub get_wh {
1204 my ($self) = @_; 1212 my ($self) = @_;
1205 1213
… …
1232 (sum @$hs), 1240 (sum @$hs),
1233 ) 1241 )
1234} 1242}
1235 1243
1236sub size_allocate { 1244sub size_allocate {
1237 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
1238 1246
1239 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1240 1248
1241 my $req_w = (sum @$ws) || 1; 1249 my $req_w = (sum @$ws) || 1;
1242 my $req_h = (sum @$hs) || 1; 1250 my $req_h = (sum @$hs) || 1;
… …
1301 } 1309 }
1302} 1310}
1303 1311
1304############################################################################# 1312#############################################################################
1305 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
1306package CFClient::UI::HBox; 1374package CFClient::UI::HBox;
1307 1375
1308# TODO: wrap into common Box base class
1309
1310our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Box::;
1311 1377
1312sub size_request { 1378sub new {
1313 my ($self) = @_; 1379 my $class = shift;
1314 1380
1315 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $class->SUPER::new (
1316 1382 vertical => 0,
1317 ( 1383 @_,
1318 (List::Util::sum map $_->[0], @alloc),
1319 (List::Util::max map $_->[1], @alloc),
1320 ) 1384 )
1321} 1385}
1322 1386
1323sub size_allocate {
1324 my ($self, $w, $h) = @_;
1325
1326 ($h, $w) = ($w, $h);
1327
1328 my $children = $self->{children};
1329
1330 my @h = map $_->{req_w}, @$children;
1331
1332 my $req_h = List::Util::sum @h;
1333
1334 if ($req_h > $h) {
1335 # ah well, not enough space
1336 $_ *= $h / $req_h for @h;
1337 } else {
1338 my $exp = List::Util::sum map $_->{expand}, @$children;
1339 $exp ||= 1;
1340
1341 for (0 .. $#$children) {
1342 my $child = $children->[$_];
1343
1344 my $alloc_h = $h[$_];
1345 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1346 $h[$_] = $alloc_h;
1347 }
1348 }
1349
1350 CFClient::UI::harmonize \@h;
1351
1352 my $y = 0;
1353 for (0 .. $#$children) {
1354 my $child = $children->[$_];
1355 my $h = $h[$_];
1356 $child->configure ($y, 0, $h, $w);
1357
1358 $y += $h;
1359 }
1360
1361 1
1362}
1363
1364############################################################################# 1387#############################################################################
1365 1388
1366package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1367 1390
1368# TODO: wrap into common Box base class
1369
1370our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1371 1392
1372sub size_request { 1393sub new {
1373 my ($self) = @_; 1394 my $class = shift;
1374 1395
1375 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1376 1397 vertical => 1,
1377 ( 1398 @_,
1378 (List::Util::max map $_->[0], @alloc),
1379 (List::Util::sum map $_->[1], @alloc),
1380 ) 1399 )
1381}
1382
1383sub size_allocate {
1384 my ($self, $w, $h) = @_;
1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1388 my $children = $self->{children};
1389
1390 my @h = map $_->{req_h}, @$children;
1391
1392 my $req_h = List::Util::sum @h;
1393
1394 if ($req_h > $h) {
1395 # ah well, not enough space
1396 $_ *= $h / $req_h for @h;
1397 } else {
1398 my $exp = List::Util::sum map $_->{expand}, @$children;
1399 $exp ||= 1;
1400
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403
1404 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1405 }
1406 }
1407
1408 CFClient::UI::harmonize \@h;
1409
1410 my $y = 0;
1411 for (0 .. $#$children) {
1412 my $child = $children->[$_];
1413 my $h = $h[$_];
1414 $child->configure (0, $y, $w, $h);
1415
1416 $y += $h;
1417 }
1418
1419 1
1420} 1400}
1421 1401
1422############################################################################# 1402#############################################################################
1423 1403
1424package CFClient::UI::Label; 1404package CFClient::UI::Label;
… …
1487 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1488 1468
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1491 1471
1472 $self->realloc;
1492 $self->update; 1473 $self->update;
1493 $self->check_size;
1494} 1474}
1495 1475
1496sub set_markup { 1476sub set_markup {
1497 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1498 1478
… …
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503 1483
1504 $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;
1505 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1506 1486
1487 $self->realloc;
1507 $self->update; 1488 $self->update;
1508 $self->check_size;
1509} 1489}
1510 1490
1511sub size_request { 1491sub size_request {
1512 my ($self) = @_; 1492 my ($self) = @_;
1513 1493
… …
1534 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1535 ) 1515 )
1536} 1516}
1537 1517
1538sub size_allocate { 1518sub size_allocate {
1539 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1540 1520
1541 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1542} 1523}
1543 1524
1544sub set_fontsize { 1525sub set_fontsize {
1545 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1546 1527
1547 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1548 delete $self->{texture}; 1529 delete $self->{texture};
1549 1530
1550 $self->update; 1531 $self->realloc;
1551 $self->check_size;
1552} 1532}
1553 1533
1554sub _draw { 1534sub _draw {
1555 my ($self) = @_; 1535 my ($self) = @_;
1556 1536
… …
1636sub set_text { 1616sub set_text {
1637 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1638 1618
1639 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1640 $self->_set_text ($text); 1620 $self->_set_text ($text);
1641 $self->update; 1621
1642 $self->check_size; 1622 $self->realloc;
1643} 1623}
1644 1624
1645sub get_text { 1625sub get_text {
1646 $_[0]{text} 1626 $_[0]{text}
1647} 1627}
… …
1680 } elsif ($uni) { 1660 } elsif ($uni) {
1681 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1682 } 1662 }
1683 1663
1684 $self->_set_text ($text); 1664 $self->_set_text ($text);
1685 $self->update; 1665
1686 $self->check_size; 1666 $self->realloc;
1687} 1667}
1688 1668
1689sub focus_in { 1669sub focus_in {
1690 my ($self) = @_; 1670 my ($self) = @_;
1691 1671
… …
2198 $self->update; 2178 $self->update;
2199 2179
2200 $self 2180 $self
2201} 2181}
2202 2182
2183sub changed { }
2184
2203sub set_range { 2185sub set_range {
2204 my ($self, $range) = @_; 2186 my ($self, $range) = @_;
2205 2187
2206 ($range, $self->{range}) = ($self->{range}, $range); 2188 ($range, $self->{range}) = ($self->{range}, $range);
2207 2189
… …
2396 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
2397 $self->reflow; 2379 $self->reflow;
2398} 2380}
2399 2381
2400sub size_allocate { 2382sub size_allocate {
2401 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
2402 2384
2403 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2404 2388
2405 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
2406 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
2408 2392
… …
2650 2634
2651 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2652} 2636}
2653 2637
2654sub size_allocate { 2638sub size_allocate {
2655 my ($self, $w, $h) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2656 2640
2641 return unless $changed;
2642
2657 $self->SUPER::size_allocate ($w - 4, $h - 4); 2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2658} 2644}
2659 2645
2660sub _draw { 2646sub _draw {
2661 my ($self) = @_; 2647 my ($self) = @_;
2662 2648
… …
2679 glVertex $w, $h; 2665 glVertex $w, $h;
2680 glVertex $w, 0; 2666 glVertex $w, 0;
2681 glEnd; 2667 glEnd;
2682 2668
2683 glTranslate 2 - 0.375, 2 - 0.375; 2669 glTranslate 2 - 0.375, 2 - 0.375;
2670
2684 $self->SUPER::_draw; 2671 $self->SUPER::_draw;
2685} 2672}
2686 2673
2687############################################################################# 2674#############################################################################
2688 2675
… …
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2789 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2790 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804 2791
2805 $row++; 2792 $row++;
2806 } 2793 }
2807}
2808
2809sub size_request {
2810 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h});
2812} 2794}
2813 2795
2814############################################################################# 2796#############################################################################
2815 2797
2816package CFClient::UI::Menu; 2798package CFClient::UI::Menu;
… …
3002use CFClient::OpenGL; 2984use CFClient::OpenGL;
3003 2985
3004sub new { 2986sub new {
3005 my $class = shift; 2987 my $class = shift;
3006 2988
3007 $class->SUPER::new ( 2989 my $self = $class->SUPER::new (
3008 visible => 1, 2990 visible => 1,
3009 @_, 2991 @_,
3010 ) 2992 );
2993
2994 Scalar::Util::weaken ($self->{root} = $self);
2995
2996 $self
3011} 2997}
3012 2998
3013sub configure { 2999sub configure {
3014 my ($self, $x, $y, $w, $h) = @_; 3000 my ($self, $x, $y, $w, $h) = @_;
3015 3001
3016 $self->{w} = $w; 3002 $self->{w} = $w;
3017 $self->{h} = $h; 3003 $self->{h} = $h;
3018} 3004}
3019 3005
3020sub check_size { 3006sub reconfigure {
3021 my ($self) = @_; 3007 my ($self) = @_;
3022 3008
3009 $self->SUPER::reconfigure;
3010
3023 $self->size_allocate ($self->{w}, $self->{h}) 3011 $self->size_allocate ($self->{w}, $self->{h}, 1)
3024 if $self->{w}; 3012 if $self->{w};
3025} 3013}
3026 3014
3027sub size_request { 3015sub size_request {
3028 my ($self) = @_; 3016 my ($self) = @_;
3029 3017
3030 ($self->{w}, $self->{h}) 3018 ($self->{w}, $self->{h})
3031} 3019}
3032 3020
3033sub size_allocate { 3021sub size_allocate {
3034 my ($self, $w, $h) = @_; 3022 my ($self, $w, $h, $changed) = @_;
3035 3023
3036 for my $child ($self->children) { 3024 for my $child ($self->children) {
3037 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)};
3038 3026
3039 $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
3040 if exists $child->{req_x}; 3028 if exists $child->{req_x};
3041 3029
3042 $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
3043 if exists $child->{req_y}; 3031 if exists $child->{req_y};
3044 3032
3045 $X = $self->{user_x} if exists $self->{user_x}; 3033 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047 3034
3048 $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;
3049 $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;
3050 3037
3051 $child->configure ($X, $Y, $W, $H); 3038 $child->configure ($X, $Y, $W, $H);
… …
3065} 3052}
3066 3053
3067sub update { 3054sub update {
3068 my ($self) = @_; 3055 my ($self) = @_;
3069 3056
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3057 $::WANT_REFRESH++;
3072} 3058}
3073 3059
3074sub add { 3060sub add {
3075 my ($self, @children) = @_; 3061 my ($self, @children) = @_;
3076
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082 3062
3083 for my $child (@children) { 3063 for my $child (@children) {
3084 $child->{is_toplevel} = 1; 3064 $child->{is_toplevel} = 1;
3085 3065
3086 # integerise window positions 3066 # integerise window positions
… …
3121 while ($self->{refresh_hook}) { 3101 while ($self->{refresh_hook}) {
3122 $_->() 3102 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3103 for values %{delete $self->{refresh_hook}};
3124 } 3104 }
3125 3105
3126 if ($self->{check_size}) { 3106 if ($self->{realloc}) {
3127 my @queue; 3107 my @queue;
3128 3108
3129 for (;;) { 3109 while () {
3130 if ($self->{check_size}) { 3110 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach 3111 #TODO use array-of-depth approach
3132 3112
3133 @queue = sort { $a->{visible} <=> $b->{visible} } 3113 @queue = sort { $a->{visible} <=> $b->{visible} }
3134 @queue, values %{delete $self->{check_size}}; 3114 @queue, values %{delete $self->{realloc}};
3135 } 3115 }
3136 3116
3137 my $widget = pop @queue || last; 3117 my $widget = pop @queue || last;
3138 3118
3139 defined $widget->{visible} or last; # do not resize invisible widgets 3119 $widget->{visible} or last; # do not resize invisible widgets
3140 3120
3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3121 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3142 ? @$widget{qw(user_w user_h)} 3122 ? @$widget{qw(def_w def_h)}
3143 : $widget->size_request; 3123 : $widget->size_request;
3144 3124
3145 if (delete $widget->{force_alloc}
3146 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147 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#
3148 3126
3149 $widget->{req_w} = $w; 3127 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h; 3128 $widget->{req_h} = $h;
3151 3129
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3130 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3153 3131
3154 $widget->{parent}->check_size 3132 push @queue, $widget->{parent}
3155 if $widget->{parent}; 3133 if $widget->{parent};
3156 }
3157 } 3134 }
3158 } 3135 }
3159 3136
3160 while ($self->{size_alloc}) { 3137 while (my $size_alloc = delete $self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) { 3138 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3162 my ($widget, $w, $h) = @$_; 3139 values %$size_alloc;
3140
3141 while () {
3142 my ($widget, $w, $h) = @{ pop @queue or last };
3163 3143
3164 $w = 0 if $w < 0; 3144 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0; 3145 $h = 0 if $h < 0;
3166 3146
3147 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3148
3167 $widget->{w} = $w; 3149 $widget->{w} = $w;
3168 $widget->{h} = $h; 3150 $widget->{h} = $h;
3151
3169 $widget->emit (size_allocate => $w, $h); 3152 $widget->emit (size_allocate => $w, $h, $changed);
3170 } 3153 }
3171 } 3154 }
3172 3155
3173 while ($self->{post_alloc_hook}) { 3156 while ($self->{post_alloc_hook}) {
3174 $_->() 3157 $_->()

Diff Legend

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