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.246 by root, Sun May 28 00:40:51 2006 UTC vs.
Revision 1.251 by root, Sun May 28 22:24:24 2006 UTC

… …
55 55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0) 56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH; 57 if $x + $TOOLTIP->{w} > $::WIDTH;
58 58
59 $TOOLTIP->move ($x, $y); 59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update; 60 $TOOLTIP->realloc;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
… …
221 } 220 }
222 221
223 $self 222 $self
224} 223}
225 224
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234}
235
236sub destroy { 225sub destroy {
237 my ($self) = @_; 226 my ($self) = @_;
238 227
239 $self->hide; 228 $self->hide;
240 %$self = (); 229 %$self = ();
241} 230}
242 231
243sub show { 232sub show {
244 my ($self) = @_; 233 my ($self) = @_;
234
245 return if $self->{parent}; 235 return if $self->{parent};
246 236
247 $CFClient::UI::ROOT->add ($self); 237 $CFClient::UI::ROOT->add ($self);
248} 238}
249 239
250sub show_centered { 240sub center {
251 my ($self) = @_; 241 my ($self) = @_;
252 return if $self->{parent};
253
254 $self->show;
255 242
256 $CFClient::UI::ROOT->on_post_alloc ( 243 $CFClient::UI::ROOT->on_post_alloc (
257 "centered $self" => sub { 244 "center_$self" => sub {
258 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 245 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
259 }, 246 },
260 ); 247 );
248
249 $self->update;
261} 250}
262 251
263sub set_visible { 252sub set_visible {
264 my ($self) = @_; 253 my ($self) = @_;
265 254
266 return if $self->{visible}; 255 return if $self->{visible};
267 256
268 $self->{root} = $self->{parent}{root}; 257 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 258 $self->{visible} = $self->{parent}{visible} + 1;
270 259
271 $self->emit (visibility_change => 1) 260 $self->emit (visibility_change => 1);
261
262 $self->realloc unless exists $self->{req_w};
263
264 $_->set_visible for $self->children;
272} 265}
273 266
274sub set_invisible { 267sub set_invisible {
275 my ($self) = @_; 268 my ($self) = @_;
276 269
277 return unless $self->{visible}; 270 return unless $self->{visible};
278 271
279 # broken show/hide model 272 $_->set_invisible for $self->children;
280 273
281 delete $self->{root}; 274 delete $self->{root};
282 delete $self->{visible}; 275 delete $self->{visible};
283 276
284 undef $GRAB if $GRAB == $self; 277 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self; 278 undef $HOVER if $HOVER == $self;
286 279
287 CFClient::UI::check_tooltip 280 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self; 281 if $TOOLTIP->{owner} == $self;
289 282
290 $self->focus_out; 283 $self->focus_out;
291 284
292 $self->emit (visibility_change => 0); 285 $self->emit (visibility_change => 0);
286}
287
288sub set_visibility {
289 my ($self, $visible) = @_;
290
291 return if $self->{visible} == $visible;
292
293 $visible ? $self->hide
294 : $self->show;
295}
296
297sub toggle_visibility {
298 my ($self) = @_;
299
300 $self->{visible}
301 ? $self->hide
302 : $self->show;
293} 303}
294 304
295sub hide { 305sub hide {
296 my ($self) = @_; 306 my ($self) = @_;
297 307
… …
315 my ($self, $w, $h) = @_; 325 my ($self, $w, $h) = @_;
316 326
317 $self->{def_w} = $w; 327 $self->{def_w} = $w;
318 $self->{def_h} = $h; 328 $self->{def_h} = $h;
319 329
320 $self->check_size; 330 $self->realloc;
321} 331}
322 332
323sub size_request { 333sub size_request {
324 require Carp; 334 require Carp;
325 Carp::confess "size_request is abstract"; 335 Carp::confess "size_request is abstract";
… …
345 $self->{y} = $y; 355 $self->{y} = $y;
346 $self->update; 356 $self->update;
347 } 357 }
348 358
349 if ($self->{w} != $w || $self->{h} != $h) { 359 if ($self->{w} != $w || $self->{h} != $h) {
360 return unless $self->{visible};
361
350 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
351 } 363 }
352} 364}
353 365
354sub size_allocate { 366sub size_allocate {
355 # nothing to be done 367 # nothing to be done
356}
357
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363} 368}
364 369
365sub children { 370sub children {
366} 371}
367 372
… …
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
449sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 454sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
455
456sub find_widget {
457 my ($self, $x, $y) = @_;
458
459 return () unless $self->{can_events};
460
461 return $self
462 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
463 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
464
465 ()
466}
467
468sub set_parent {
469 my ($self, $parent) = @_;
470
471 Scalar::Util::weaken ($self->{parent} = $parent);
472
473 $self->set_visible if $parent->{visible};
474
475 $self->realloc;
476}
477
478sub connect {
479 my ($self, $signal, $cb) = @_;
480
481 push @{ $self->{signal_cb}{$signal} }, $cb;
482}
483
484sub _emit {
485 my ($self, $signal, @args) = @_;
486
487 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
488}
489
490sub emit {
491 my ($self, $signal, @args) = @_;
492
493 $self->_emit ($signal, @args)
494 || $self->$signal (@args);
495}
496
497sub visibility_change {
498 #my ($self, $visible) = @_;
499}
500
501sub realloc {
502 my ($self) = @_;
503
504 return unless $self->{visible};
505
506 return if $self->{root}{realloc}{$self};
507
508 $self->{root}{realloc}{$self} = $self;
509 $self->{root}->update;
510}
511
512sub update {
513 my ($self) = @_;
514
515 $self->{parent}->update
516 if $self->{parent};
517}
450 518
451sub draw { 519sub draw {
452 my ($self) = @_; 520 my ($self) = @_;
453 521
454 return unless $self->{h} && $self->{w}; 522 return unless $self->{h} && $self->{w};
… …
492 my ($self) = @_; 560 my ($self) = @_;
493 561
494 warn "no draw defined for $self\n"; 562 warn "no draw defined for $self\n";
495} 563}
496 564
497sub find_widget {
498 my ($self, $x, $y) = @_;
499
500 return () unless $self->{can_events};
501
502 return $self
503 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506 ()
507}
508
509sub set_parent {
510 my ($self, $parent) = @_;
511
512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible;
515
516 $self->check_size;
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 { 565sub DESTROY {
558 my ($self) = @_; 566 my ($self) = @_;
559 567
560 delete $WIDGET{$self+0}; 568 delete $WIDGET{$self+0};
561 #$self->deactivate; 569 #$self->deactivate;
… …
656 $self->{children} = [ 664 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 665 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 666 @{$self->{children}}, @widgets
659 ]; 667 ];
660 668
661 $self->check_size (1); 669 $self->realloc;
662 $self->update;
663} 670}
664 671
665sub children { 672sub children {
666 @{ $_[0]{children} } 673 @{ $_[0]{children} }
667} 674}
… …
672 delete $child->{parent}; 679 delete $child->{parent};
673 $child->hide; 680 $child->hide;
674 681
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 682 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 683
677 $self->check_size (1); 684 $self->realloc;
678 $self->update;
679} 685}
680 686
681sub clear { 687sub clear {
682 my ($self) = @_; 688 my ($self) = @_;
683 689
… …
687 for (@$children) { 693 for (@$children) {
688 delete $_->{parent}; 694 delete $_->{parent};
689 $_->hide; 695 $_->hide;
690 } 696 }
691 697
692 $self->check_size; 698 $self->realloc;
693 $self->update;
694} 699}
695 700
696sub find_widget { 701sub find_widget {
697 my ($self, $x, $y) = @_; 702 my ($self, $x, $y) = @_;
698 703
… …
751sub size_request { 756sub size_request {
752 $_[0]{children}[0]->size_request 757 $_[0]{children}[0]->size_request
753} 758}
754 759
755sub size_allocate { 760sub size_allocate {
756 my ($self, $w, $h) = @_; 761 my ($self, $w, $h, $changed) = @_;
757 762
758 $self->{children}[0]->configure (0, 0, $w, $h); 763 $self->{children}[0]->configure (0, 0, $w, $h);
759} 764}
760 765
761############################################################################# 766#############################################################################
… …
778 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 783 $ROOT->on_post_alloc ($self => sub { $self->render_child });
779 $self->SUPER::update; 784 $self->SUPER::update;
780} 785}
781 786
782sub size_allocate { 787sub size_allocate {
783 my ($self, $w, $h) = @_; 788 my ($self, $w, $h, $changed) = @_;
784 789
785 $self->SUPER::size_allocate ($w, $h); 790 $self->SUPER::size_allocate ($w, $h, $changed);
786 $self->update; 791 $self->update
792 if $changed;
787} 793}
788 794
789sub _render { 795sub _render {
790 $_[0]{children}[0]->draw; 796 $_[0]{children}[0]->draw;
791} 797}
… …
835} 841}
836 842
837sub size_request { 843sub size_request {
838 my ($self) = @_; 844 my ($self) = @_;
839 845
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
841 847
842 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
843} 852}
844 853
845sub size_allocate { 854sub size_allocate {
846 my ($self, $w, $h) = @_; 855 my ($self, $w, $h, $changed) = @_;
847 856
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850 859
851 $self->child->configure (0, 0, $w, $h); 860 $self->child->configure (0, 0, $w, $h);
… …
938 my $child = $self->{vp}->child; 947 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
940} 949}
941 950
942sub size_allocate { 951sub size_allocate {
943 my ($self, $w, $h) = @_; 952 my ($self, $w, $h, $changed) = @_;
944 953
945 $self->SUPER::size_allocate ($w, $h); 954 $self->SUPER::size_allocate ($w, $h, $changed);
946 955
947 my $child = $self->{vp}->child; 956 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 958}
950 959
… …
1038 $h + $self->border * 2, 1047 $h + $self->border * 2,
1039 ) 1048 )
1040} 1049}
1041 1050
1042sub size_allocate { 1051sub size_allocate {
1043 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h, $changed) = @_;
1053
1054 return unless $changed;
1044 1055
1045 $h -= List::Util::max 0, $self->border * 2; 1056 $h -= List::Util::max 0, $self->border * 2;
1046 $w -= List::Util::max 0, $self->border * 2; 1057 $w -= List::Util::max 0, $self->border * 2;
1047 1058
1048 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1059 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1077 $self->{user_x} = $wx + $dx * $mx; 1088 $self->{user_x} = $wx + $dx * $mx;
1078 $self->{user_y} = $wy + $dy * $my; 1089 $self->{user_y} = $wy + $dy * $my;
1079 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1080 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1081 $self->move ($self->{user_x}, $self->{user_y}); 1092 $self->move ($self->{user_x}, $self->{user_y});
1082 $self->check_size; 1093 $self->realloc;
1083 }; 1094 };
1084 1095
1085 } elsif ($lr ^ $td) { 1096 } elsif ($lr ^ $td) {
1086 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1097 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1087 my ($bx, $by) = ($self->{x}, $self->{y}); 1098 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1093 1104
1094 $self->{user_x} = $bx + $x - $ox; 1105 $self->{user_x} = $bx + $x - $ox;
1095 $self->{user_y} = $by + $y - $oy; 1106 $self->{user_y} = $by + $y - $oy;
1096 1107
1097 $self->move ($self->{user_x}, $self->{user_y}); 1108 $self->move ($self->{user_x}, $self->{user_y});
1098 $self->update; 1109 $self->realloc;
1099 }; 1110 };
1100 } 1111 }
1101} 1112}
1102 1113
1103sub button_up { 1114sub button_up {
… …
1178 my ($self, $x, $y, $child) = @_; 1189 my ($self, $x, $y, $child) = @_;
1179 1190
1180 $child->set_parent ($self); 1191 $child->set_parent ($self);
1181 $self->{children}[$y][$x] = $child; 1192 $self->{children}[$y][$x] = $child;
1182 1193
1183 $self->check_size (1); 1194 $self->realloc;
1184} 1195}
1185 1196
1186# TODO: move to container class maybe? send children a signal on removal? 1197# TODO: move to container class maybe? send children a signal on removal?
1187sub clear { 1198sub clear {
1188 my ($self) = @_; 1199 my ($self) = @_;
… …
1193 for (@children) { 1204 for (@children) {
1194 delete $_->{parent}; 1205 delete $_->{parent};
1195 $_->hide; 1206 $_->hide;
1196 } 1207 }
1197 1208
1198 $self->check_size (1); 1209 $self->realloc;
1199 $self->update;
1200} 1210}
1201 1211
1202sub get_wh { 1212sub get_wh {
1203 my ($self) = @_; 1213 my ($self) = @_;
1204 1214
… …
1231 (sum @$hs), 1241 (sum @$hs),
1232 ) 1242 )
1233} 1243}
1234 1244
1235sub size_allocate { 1245sub size_allocate {
1236 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h, $changed) = @_;
1237 1247
1238 my ($ws, $hs) = $self->get_wh; 1248 my ($ws, $hs) = $self->get_wh;
1239 1249
1240 my $req_w = (sum @$ws) || 1; 1250 my $req_w = (sum @$ws) || 1;
1241 my $req_h = (sum @$hs) || 1; 1251 my $req_h = (sum @$hs) || 1;
… …
1319 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1329 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1320 ) 1330 )
1321} 1331}
1322 1332
1323sub size_allocate { 1333sub size_allocate {
1324 my ($self, $w, $h) = @_; 1334 my ($self, $w, $h, $changed) = @_;
1325 1335
1326 my $space = $self->{vertical} ? $h : $w; 1336 my $space = $self->{vertical} ? $h : $w;
1327 my $children = $self->{children}; 1337 my $children = $self->{children};
1328 1338
1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1339 my @req;
1330 my $req = List::Util::sum @req;
1331 1340
1332 if ($req > $space) { 1341 if ($self->{homogeneous}) {
1333 # ah well, not enough space 1342 @req = ($space / (@$children || 1)) x @$children;
1334 $_ *= $space / $req for @req;
1335 } else { 1343 } else {
1344 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1345 my $req = List::Util::sum @req;
1346
1347 if ($req > $space) {
1348 # ah well, not enough space
1349 $_ *= $space / $req for @req;
1350 } else {
1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1351 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1337 1352
1353 $space = ($space - $req) / $expand; # remaining space to give away
1354
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand 1355 $req[$_] += $space * $children->[$_]{expand}
1339 for 0 .. $#$children; 1356 for 0 .. $#$children;
1357 }
1340 } 1358 }
1341 1359
1342 CFClient::UI::harmonize \@req; 1360 CFClient::UI::harmonize \@req;
1343 1361
1344 my $pos = 0; 1362 my $pos = 0;
… …
1450 $self->{text} = "T$text"; 1468 $self->{text} = "T$text";
1451 1469
1452 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1453 $self->{layout}->set_text ($text); 1471 $self->{layout}->set_text ($text);
1454 1472
1455 $self->update; 1473 $self->realloc;
1456 $self->check_size;
1457} 1474}
1458 1475
1459sub set_markup { 1476sub set_markup {
1460 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1461 1478
… …
1465 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466 1483
1467 $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;
1468 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1469 1486
1470 $self->update; 1487 $self->realloc;
1471 $self->check_size;
1472} 1488}
1473 1489
1474sub size_request { 1490sub size_request {
1475 my ($self) = @_; 1491 my ($self) = @_;
1476 1492
… …
1497 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1498 ) 1514 )
1499} 1515}
1500 1516
1501sub size_allocate { 1517sub size_allocate {
1502 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1503 1519
1504 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1505} 1522}
1506 1523
1507sub set_fontsize { 1524sub set_fontsize {
1508 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1509 1526
1510 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1511 delete $self->{texture}; 1528 delete $self->{texture};
1512 1529
1513 $self->update; 1530 $self->realloc;
1514 $self->check_size;
1515} 1531}
1516 1532
1517sub _draw { 1533sub _draw {
1518 my ($self) = @_; 1534 my ($self) = @_;
1519 1535
… …
1599sub set_text { 1615sub set_text {
1600 my ($self, $text) = @_; 1616 my ($self, $text) = @_;
1601 1617
1602 $self->{cursor} = length $text; 1618 $self->{cursor} = length $text;
1603 $self->_set_text ($text); 1619 $self->_set_text ($text);
1604 $self->update; 1620
1605 $self->check_size; 1621 $self->realloc;
1606} 1622}
1607 1623
1608sub get_text { 1624sub get_text {
1609 $_[0]{text} 1625 $_[0]{text}
1610} 1626}
… …
1643 } elsif ($uni) { 1659 } elsif ($uni) {
1644 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1645 } 1661 }
1646 1662
1647 $self->_set_text ($text); 1663 $self->_set_text ($text);
1648 $self->update; 1664
1649 $self->check_size; 1665 $self->realloc;
1650} 1666}
1651 1667
1652sub focus_in { 1668sub focus_in {
1653 my ($self) = @_; 1669 my ($self) = @_;
1654 1670
… …
2161 $self->update; 2177 $self->update;
2162 2178
2163 $self 2179 $self
2164} 2180}
2165 2181
2182sub changed { }
2183
2166sub set_range { 2184sub set_range {
2167 my ($self, $range) = @_; 2185 my ($self, $range) = @_;
2168 2186
2169 ($range, $self->{range}) = ($self->{range}, $range); 2187 ($range, $self->{range}) = ($self->{range}, $range);
2170 2188
… …
2359 $self->{fontsize} = $fontsize; 2377 $self->{fontsize} = $fontsize;
2360 $self->reflow; 2378 $self->reflow;
2361} 2379}
2362 2380
2363sub size_allocate { 2381sub size_allocate {
2364 my ($self, $w, $h) = @_; 2382 my ($self, $w, $h, $changed) = @_;
2365 2383
2366 $self->SUPER::size_allocate ($w, $h); 2384 $self->SUPER::size_allocate ($w, $h, $changed);
2385
2386 return unless $changed;
2367 2387
2368 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2388 $self->{layout}->set_font ($self->{font}) if $self->{font};
2369 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2370 $self->{layout}->set_width ($self->{children}[0]{w}); 2390 $self->{layout}->set_width ($self->{children}[0]{w});
2371 2391
… …
2613 2633
2614 ($w + 4, $h + 4) 2634 ($w + 4, $h + 4)
2615} 2635}
2616 2636
2617sub size_allocate { 2637sub size_allocate {
2618 my ($self, $w, $h) = @_; 2638 my ($self, $w, $h, $changed) = @_;
2619 2639
2640 return unless $changed;
2641
2620 $self->SUPER::size_allocate ($w - 4, $h - 4); 2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2621} 2643}
2622 2644
2623sub _draw { 2645sub _draw {
2624 my ($self) = @_; 2646 my ($self) = @_;
2625 2647
… …
2960use CFClient::OpenGL; 2982use CFClient::OpenGL;
2961 2983
2962sub new { 2984sub new {
2963 my $class = shift; 2985 my $class = shift;
2964 2986
2965 $class->SUPER::new ( 2987 my $self = $class->SUPER::new (
2966 visible => 1, 2988 visible => 1,
2967 @_, 2989 @_,
2968 ) 2990 );
2991
2992 Scalar::Util::weaken ($self->{root} = $self);
2993
2994 $self
2969} 2995}
2970 2996
2971sub configure { 2997sub configure {
2972 my ($self, $x, $y, $w, $h) = @_; 2998 my ($self, $x, $y, $w, $h) = @_;
2973 2999
2974 $self->{w} = $w; 3000 $self->{w} = $w;
2975 $self->{h} = $h; 3001 $self->{h} = $h;
2976} 3002}
2977 3003
2978sub check_size { 3004sub reconfigure {
2979 my ($self) = @_; 3005 my ($self) = @_;
2980 3006
3007 $self->SUPER::reconfigure;
3008
2981 $self->size_allocate ($self->{w}, $self->{h}) 3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
2982 if $self->{w}; 3010 if $self->{w};
2983} 3011}
2984 3012
2985sub size_request { 3013sub size_request {
2986 my ($self) = @_; 3014 my ($self) = @_;
2987 3015
2988 ($self->{w}, $self->{h}) 3016 ($self->{w}, $self->{h})
2989} 3017}
2990 3018
2991sub size_allocate { 3019sub size_allocate {
2992 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h, $changed) = @_;
2993 3021
2994 for my $child ($self->children) { 3022 for my $child ($self->children) {
2995 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2996 3024
2997 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2998 if exists $child->{req_x}; 3026 if exists $child->{req_x};
2999 3027
3000 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3001 if exists $child->{req_y}; 3029 if exists $child->{req_y};
3002 3030
3003 delete @$child{qw(req_x req_y)}; 3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3004 3032
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3035
3008 $child->configure ($X, $Y, $W, $H); 3036 $child->configure ($X, $Y, $W, $H);
… …
3022} 3050}
3023 3051
3024sub update { 3052sub update {
3025 my ($self) = @_; 3053 my ($self) = @_;
3026 3054
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3055 $::WANT_REFRESH++;
3029} 3056}
3030 3057
3031sub add { 3058sub add {
3032 my ($self, @children) = @_; 3059 my ($self, @children) = @_;
… …
3038 $child->{x} = int $child->{x}; 3065 $child->{x} = int $child->{x};
3039 $child->{y} = int $child->{y}; 3066 $child->{y} = int $child->{y};
3040 } 3067 }
3041 3068
3042 $self->SUPER::add (@children); 3069 $self->SUPER::add (@children);
3043
3044 for (my @widgets = @children; my $w = pop @widgets; ) {
3045 push @widgets, $w->children;
3046 $w->set_visible;
3047 }
3048
3049} 3070}
3050 3071
3051sub remove { 3072sub remove {
3052 my ($self, @children) = @_; 3073 my ($self, @children) = @_;
3053 3074
… …
3078 while ($self->{refresh_hook}) { 3099 while ($self->{refresh_hook}) {
3079 $_->() 3100 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3101 for values %{delete $self->{refresh_hook}};
3081 } 3102 }
3082 3103
3083 if ($self->{check_size}) { 3104 if ($self->{realloc}) {
3084 my @queue; 3105 my @queue;
3085 3106
3086 for (;;) { 3107 while () {
3087 if ($self->{check_size}) { 3108 if ($self->{realloc}) {
3088 #TODO use array-of-depth approach 3109 #TODO use array-of-depth approach
3089 3110
3090 @queue = sort { $a->{visible} <=> $b->{visible} } 3111 @queue = sort { $a->{visible} <=> $b->{visible} }
3091 @queue, values %{delete $self->{check_size}}; 3112 @queue, values %{delete $self->{realloc}};
3092 } 3113 }
3093 3114
3094 my $widget = pop @queue || last; 3115 my $widget = pop @queue || last;
3095 3116
3096 defined $widget->{visible} or last; # do not resize invisible widgets 3117 $widget->{visible} or last; # do not resize invisible widgets
3097 3118
3098 my ($w, $h) = $widget->{def_w} && $widget->{def_h} 3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3099 ? @$widget{qw(def_w def_h)} 3120 ? @$widget{qw(def_w def_h)}
3100 : $widget->size_request; 3121 : $widget->size_request;
3101 3122
3102 if (delete $widget->{force_alloc}
3103 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3104 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3123 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3105 3124
3106 $widget->{req_w} = $w; 3125 $widget->{req_w} = $w;
3107 $widget->{req_h} = $h; 3126 $widget->{req_h} = $h;
3108 3127
3109 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3110 3129
3111 $widget->{parent}->check_size 3130 push @queue, $widget->{parent}
3112 if $widget->{parent}; 3131 if $widget->{parent};
3113 }
3114 } 3132 }
3115 } 3133 }
3116 3134
3117 while ($self->{size_alloc}) { 3135 while (my $size_alloc = delete $self->{size_alloc}) {
3118 for (values %{delete $self->{size_alloc}}) { 3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3119 my ($widget, $w, $h) = @$_; 3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
3120 3141
3121 $w = 0 if $w < 0; 3142 $w = 0 if $w < 0;
3122 $h = 0 if $h < 0; 3143 $h = 0 if $h < 0;
3123 3144
3124 $widget->{w} = $w; 3145 $widget->{w} = $w;
3125 $widget->{h} = $h; 3146 $widget->{h} = $h;
3126 $widget->emit (size_allocate => $w, $h); 3147 $widget->emit (size_allocate => $w, $h, 1);
3127 } 3148 }
3128 } 3149 }
3129 3150
3130 while ($self->{post_alloc_hook}) { 3151 while ($self->{post_alloc_hook}) {
3131 $_->() 3152 $_->()

Diff Legend

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