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.189 by root, Mon May 8 22:17:24 2006 UTC vs.
Revision 1.194 by root, Thu May 11 23:41:47 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
232 $self->{y} = $y; 233 $self->{y} = $y;
233 $self->update; 234 $self->update;
234 } 235 }
235 236
236 if ($self->{w} != $w || $self->{h} != $h) { 237 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 239 }
244} 240}
245 241
246sub size_allocate { 242sub size_allocate {
247 # nothing to be done 243 # nothing to be done
… …
256 252
257 $_->reconfigure 253 $_->reconfigure
258 for $self->children; 254 for $self->children;
259 255
260 $self->check_size; 256 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h}); 257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
262 $self->update; 258 $self->update;
263} 259}
264 260
265sub set_max_size { 261sub set_max_size {
266 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
267 263
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
270}
271
272# return top left coordinates
273sub _topleft {
274 my ($self, $x, $y) = @_;
275
276 $self->{parent}
277 or Carp::confess "no parent widget in _topleft\n";#d#
278
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
280} 266}
281 267
282# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
283sub coord2local { 269sub coord2local {
284 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
285 271
286 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 273}
289 274
290# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
291sub coord2global { 276sub coord2global {
292 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
293 278
294 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 280}
297 281
298sub focus_in { 282sub focus_in {
299 my ($self) = @_; 283 my ($self) = @_;
300 284
… …
398 382
399sub set_parent { 383sub set_parent {
400 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
401 385
402 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
403} 390}
404 391
405sub check_size { 392sub check_size {
406 my ($self) = @_; 393 my ($self) = @_;
407 394
408 $self->_check_size;
409 return;
410 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
411
412 $check_size->{$self} = $self;
413
414 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
415 while (%$check_size) {
416 my @widgets = values %$check_size;
417 $_->_check_size
418 for @widgets;
419 }
420 });
421}
422
423sub _check_size {
424 my ($self) = @_;
425
426 delete $CFClient::UI::ROOT->{_check_size}{$self}; 395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
427
428 $self->{parent}
429 or return 1;
430
431 my ($w, $h) = $self->{user_w} && $self->{user_h}
432 ? @$self{qw(user_w user_h)}
433 : $self->size_request;
434
435 if ($w != $self->{req_w} || $h != $self->{req_h}) {
436 $self->{req_w} = $w;
437 $self->{req_h} = $h;
438
439 $self->{parent}->_check_size
440 or $self->size_allocate (
441 (List::Util::max $self->{w}, $w),
442 (List::Util::max $self->{h}, $h),
443 );
444
445 1
446 } else {
447 0
448 }
449} 396}
450 397
451sub update { 398sub update {
452 my ($self) = @_; 399 my ($self) = @_;
453 400
454 my $update = $CFClient::UI::ROOT->{_update} ||= {}; 401 $self->{parent}->update
455 402 if $self->{parent};
456 $update->{$self} = $self;
457
458 $CFClient::UI::ROOT->on_refresh (_update => sub {
459 while (%$update) {
460 my @widgets = values %$update;
461 %$update = ();
462
463 $_->{parent} && $_->{parent}->update
464 for @widgets;
465 }
466 });
467} 403}
468 404
469sub connect { 405sub connect {
470 my ($self, $signal, $cb) = @_; 406 my ($self, $signal, $cb) = @_;
471 407
… …
573 $self->{children} = [ 509 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 511 @{$self->{children}}, @widgets
576 ]; 512 ];
577 513
578 $_->check_size 514 $self->check_size;
579 for @widgets;
580
581 $self->update; 515 $self->update;
582} 516}
583 517
584sub children { 518sub children {
585 @{ $_[0]{children} } 519 @{ $_[0]{children} }
… …
733 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
734 668
735 my $tex = $self->{texture} 669 my $tex = $self->{texture}
736 or return; 670 or return;
737 671
738 glEnable GL_BLEND;
739 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
740 glEnable GL_TEXTURE_2D; 672 glEnable GL_TEXTURE_2D;
741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
742 glColor 0, 0, 0, 1; 674 glColor 0, 0, 0, 1;
743 675
744 $tex->draw_quad (0, 0, $w, $h); 676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
745 677
746 glDisable GL_BLEND;
747 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
748} 679}
749 680
750############################################################################# 681#############################################################################
751 682
… …
775 $self->{view_y} = int $y; 706 $self->{view_y} = int $y;
776 707
777 $self->update; 708 $self->update;
778} 709}
779 710
780# hmm, this does not work for topleft of $self... but we should not aks for that 711# hmm, this does not work for topleft of $self... but we should not ask for that
781sub _topleft { 712sub coord2local {
782 my ($self, $x, $y) = @_; 713 my ($self, $x, $y) = @_;
783 714
784 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 715 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
716}
717
718sub coord2global {
719 my ($self, $x, $y) = @_;
720
721 $x = List::Util::min $self->{w}, $x - $self->{view_x};
722 $y = List::Util::min $self->{h}, $y - $self->{view_y};
723
724 $self->SUPER::coord2global ($x, $y)
785} 725}
786 726
787sub find_widget { 727sub find_widget {
788 my ($self, $x, $y) = @_; 728 my ($self, $x, $y) = @_;
789 729
… …
1271} 1211}
1272 1212
1273sub size_allocate { 1213sub size_allocate {
1274 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1275 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1276 my $children = $self->{children}; 1218 my $children = $self->{children};
1277 1219
1278 my @h = map $_->{req_h}, @$children; 1220 my @h = map $_->{req_h}, @$children;
1279 1221
1280 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
… …
1319 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1320 1262
1321 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1322 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1323 #font => default_font 1265 #font => default_font
1266 #text => initial text
1267 #markup => initial narkup
1268 layout => (new CFClient::Layout),
1324 fontsize => 1, 1269 fontsize => 1,
1325 text => "",
1326 align => -1, 1270 align => -1,
1327 valign => -1, 1271 valign => -1,
1328 padding => 2, 1272 padding => 2,
1329 layout => new CFClient::Layout,
1330 can_events => 0, 1273 can_events => 0,
1331 %arg 1274 %arg
1332 ); 1275 );
1333 1276
1334 if (exists $self->{template}) { 1277 if (exists $self->{template}) {
1335 my $layout = new CFClient::Layout; 1278 my $layout = new CFClient::Layout;
1336 $layout->set_text (delete $self->{template}); 1279 $layout->set_text (delete $self->{template});
1337 $self->{template} = $layout; 1280 $self->{template} = $layout;
1338 } 1281 }
1339 1282
1340 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1341 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1284 $self->set_markup (delete $self->{markup});
1285 } else {
1286 $self->set_text (delete $self->{text});
1287 }
1342 1288
1343 $self 1289 $self
1344} 1290}
1345 1291
1346sub escape { 1292sub escape {
… …
1364 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1365 1311
1366 return if $self->{text} eq "T$text"; 1312 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text"; 1313 $self->{text} = "T$text";
1368 1314
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1369 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1370 1317
1371 delete $self->{texture};
1372 $self->update; 1318 $self->update;
1373 $self->check_size; 1319 $self->check_size;
1374} 1320}
1375 1321
1376sub set_markup { 1322sub set_markup {
1377 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1378 1324
1379 return if $self->{text} eq "M$markup"; 1325 return if $self->{text} eq "M$markup";
1380 $self->{text} = "M$markup"; 1326 $self->{text} = "M$markup";
1381 1327
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1382 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1383 1332
1384 delete $self->{texture};
1385 $self->update; 1333 $self->update;
1386 $self->check_size; 1334 $self->check_size;
1387} 1335}
1388 1336
1389sub size_request { 1337sub size_request {
… …
1429 1377
1430sub _draw { 1378sub _draw {
1431 my ($self) = @_; 1379 my ($self) = @_;
1432 1380
1433 my $tex = $self->{texture} ||= do { 1381 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}});
1434 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1383 $self->{layout}->set_font ($self->{font}) if $self->{font};
1435 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1436 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1386
1437 new_from_layout CFClient::Texture $self->{layout} 1387 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1438 }; 1398 };
1439 1399
1440 glEnable GL_BLEND;
1441 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1442 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1444 1402
1403 if ($tex->{format} == GL_ALPHA) {
1445 glColor @{$self->{fg}}; 1404 glColor @{$self->{fg}};
1446
1447 $self->{ox} = int (
1448 $self->{align} < 0 ? $self->{padding}
1449 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1450 : ($self->{w} - $tex->{w}) * 0.5
1451 );
1452
1453 $self->{oy} = int (
1454 $self->{valign} < 0 ? $self->{padding}
1455 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1456 : ($self->{h} - $tex->{h}) * 0.5
1457 );
1458
1459 $tex->draw_quad ($self->{ox}, $self->{oy}); 1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1406 } else {
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 }
1460 1409
1461 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1462 glDisable GL_BLEND;
1463} 1411}
1464 1412
1465############################################################################# 1413#############################################################################
1466 1414
1467package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
… …
1502 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1503 1451
1504 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1505} 1453}
1506 1454
1455sub set_text {
1456 my ($self, $text) = @_;
1457
1458 $self->{cursor} = length $text;
1459 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462}
1463
1507sub get_text { 1464sub get_text {
1508 $_[0]{text} 1465 $_[0]{text}
1509} 1466}
1510 1467
1511sub size_request { 1468sub size_request {
… …
1518 1475
1519sub size_allocate { 1476sub size_allocate {
1520 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1521 1478
1522 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1523}
1524
1525sub set_text {
1526 my ($self, $text) = @_;
1527
1528 $self->{cursor} = length $text;
1529 $self->_set_text ($text);
1530 $self->update;
1531} 1480}
1532 1481
1533sub key_down { 1482sub key_down {
1534 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1535 1484
… …
2541sub new { 2490sub new {
2542 my $class = shift; 2491 my $class = shift;
2543 2492
2544 my %args = @_; 2493 my %args = @_;
2545 2494
2546 my $item = $args{item}; 2495 my $item = delete $args{item};
2547 2496
2548 my $desc = $item->{nrof} < 2 2497 my $desc = $item->{nrof} < 2
2549 ? $item->{name} 2498 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}"; 2499 : "$item->{nrof} $item->{name_pl}";
2551 2500
… …
2580 2529
2581 1 2530 1
2582 }, 2531 },
2583 %args 2532 %args
2584 ); 2533 );
2534
2585 $self->add(new CFClient::UI::Face 2535 $self->add (new CFClient::UI::Face
2586 can_events => 0, 2536 can_events => 0,
2587 face => $item->{face}, 2537 face => $item->{face},
2588 anim => $item->{anim}, 2538 anim => $item->{anim},
2589 animspeed => $item->{animspeed}); 2539 animspeed => $item->{animspeed},
2540 );
2541
2590 $self->add(new CFClient::UI::Label 2542 $self->add (new CFClient::UI::Label
2591 can_events => 0, 2543 can_events => 0,
2592 text => $desc); 2544 text => $desc,
2545 );
2593 2546
2594 $self 2547 $self
2595} 2548}
2596 2549
2597############################################################################# 2550#############################################################################
… …
2624 for my $item (@items) { 2577 for my $item (@items) {
2625 my $desc = $item->{nrof} < 2 2578 my $desc = $item->{nrof} < 2
2626 ? $item->{name} 2579 ? $item->{name}
2627 : "$item->{nrof} $item->{name_pl}"; 2580 : "$item->{nrof} $item->{name_pl}";
2628 2581
2629 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2582 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2630 } 2583 }
2631 2584
2632# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2585# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633} 2586}
2634 2587
… …
2709 } 2662 }
2710} 2663}
2711 2664
2712############################################################################# 2665#############################################################################
2713 2666
2667package CFClient::UI::Statusbox;
2668
2669our @ISA = CFClient::UI::VBox::;
2670
2671sub reorder {
2672 my ($self) = @_;
2673 my $NOW = time;
2674
2675 while (my ($k, $v) = each %{ $self->{item} }) {
2676 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677 }
2678
2679 my @widgets;
2680 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
2681 my $count = 10 + 1;
2682 for my $item (@items) {
2683 last unless --$count;
2684
2685 push @widgets, $item->{label} ||= do {
2686 # TODO: doesn't handle markup well (read as: at all)
2687 my $short = delete $item->{text};
2688 for ($short) {
2689 s/^\s+//;
2690 s/\012.*//s;
2691 my $len = int 30 / $item->{fontsize};
2692 substr $_, $len, length, "…" if $len < length;
2693 }
2694
2695 new CFClient::UI::Label
2696 markup => $short,
2697 tooltip => delete $item->{tooltip},
2698 fontsize => delete $item->{fontsize},
2699 color => delete $item->{color},
2700 can_events => 1,
2701 can_hover => 1,
2702 };
2703 }
2704
2705 $self->clear;
2706 $self->SUPER::add (@widgets);
2707}
2708
2709sub add {
2710 my ($self, $text, %arg) = @_;
2711
2712 my $item = {
2713 time => time,
2714 text => $text,
2715 timeout => 60,
2716 tooltip => $text,
2717 fontsize => 0.8,
2718 color => [0.8, 0.8, 0.8, 0.8],
2719 %arg,
2720 };
2721
2722 $item->{timeout} += time;
2723 $item->{group} ||= $item+0;
2724
2725 $item = $self->{item}{$item->{group}} ||= $item;
2726
2727 $self->reorder;
2728}
2729
2730#############################################################################
2731
2714package CFClient::UI::Root; 2732package CFClient::UI::Root;
2715 2733
2716our @ISA = CFClient::UI::Container::; 2734our @ISA = CFClient::UI::Container::;
2717 2735
2718use CFClient::OpenGL; 2736use CFClient::OpenGL;
2719 2737
2738sub new {
2739 my $class = shift;
2740
2741 $class->SUPER::new (
2742 @_,
2743 )
2744}
2745
2746sub configure {
2747 my ($self, $x, $y, $w, $h) = @_;
2748
2749 $self->{w} = $w;
2750 $self->{h} = $h;
2751}
2752
2720sub check_size { 2753sub check_size {
2721 my ($self) = @_; 2754 my ($self) = @_;
2722 2755
2723 $self->configure (0, 0, $self->{w}, $self->{h}); 2756 $self->size_allocate ($self->{w}, $self->{h})
2757 if $self->{w};
2724} 2758}
2725 2759
2726sub size_request { 2760sub size_request {
2727 my ($self) = @_; 2761 my ($self) = @_;
2728 2762
… …
2746 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h}; 2780 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2747 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h}; 2781 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2748 } 2782 }
2749 } 2783 }
2750 2784
2751 $self->{old_w} = $w;
2752 $self->{old_h} = $h;
2753}
2754
2755sub configure {
2756 my ($self, $x, $y, $w, $h) = @_;
2757
2758 $self->SUPER::configure ($x, $y, $w, $h);
2759
2760 for my $child ($self->children) { 2785 for my $child ($self->children) {
2761 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2786 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2762 2787
2763 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2788 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2764 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2789 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2765 $child->configure ($X, $Y, $W, $H); 2790 $child->configure ($X, $Y, $W, $H);
2766 } 2791 }
2767}
2768 2792
2769sub _topleft { 2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795}
2796
2797sub coord2local {
2770 my ($self, $x, $y) = @_; 2798 my ($self, $x, $y) = @_;
2771 2799
2772 ($x, $y) 2800 ($x, $y)
2773} 2801}
2774 2802
2803sub coord2global {
2804 my ($self, $x, $y) = @_;
2805
2806 ($x, $y)
2807}
2808
2775sub update { 2809sub update {
2776 my ($self) = @_; 2810 my ($self) = @_;
2777 2811
2778 $self->check_size; 2812 $self->check_size;
2779 ::refresh (); 2813 $::WANT_REFRESH++;
2780} 2814}
2781 2815
2782sub add { 2816sub add {
2783 my ($self, $child) = @_; 2817 my ($self, $child) = @_;
2784 2818
2785 # integerize window positions 2819 # integerise window positions
2786 $child->{x} = int $child->{x}; 2820 $child->{x} = int $child->{x};
2787 $child->{y} = int $child->{y}; 2821 $child->{y} = int $child->{y};
2788 2822
2789 $self->SUPER::add ($child); 2823 $self->SUPER::add ($child);
2790} 2824}
… …
2793 my ($self, $id, $cb) = @_; 2827 my ($self, $id, $cb) = @_;
2794 2828
2795 $self->{refresh_hook}{$id} = $cb; 2829 $self->{refresh_hook}{$id} = $cb;
2796} 2830}
2797 2831
2798sub draw { 2832sub draw {
2799 my ($self) = @_; 2833 my ($self) = @_;
2800 2834
2835 if ($self->{check_size}) {
2836 my @queue = ([], []);
2837
2838 for (;;) {
2839 if ($self->{check_size}) {
2840 # heuristic: check containers last
2841 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2842 for values %{delete $self->{check_size}}
2843 }
2844
2845 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2846
2847 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848 ? @$widget{qw(user_w user_h)}
2849 : $widget->size_request;
2850
2851 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2852 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853
2854 $widget->{req_w} = $w;
2855 $widget->{req_h} = $h;
2856
2857 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2858
2859 $widget->{parent}->check_size
2860 if $widget->{parent};
2861 }
2862 }
2863 }
2864
2865 while ($self->{size_alloc}) {
2866 for (values %{delete $self->{size_alloc}}) {
2867 my ($widget, $w, $h) = @$_;
2868
2869 $w = 0 if $w < 0;
2870 $h = 0 if $h < 0;
2871
2872 $widget->{w} = $w;
2873 $widget->{h} = $h;
2874 $widget->size_allocate ($w, $h);
2875 $widget->emit (size_allocate => $w, $h);
2876 }
2877 }
2878
2801 while (my $rcb = delete $self->{refresh_hook}) { 2879 while ($self->{refresh_hook}) {
2802 $_->() for values %$rcb; 2880 $_->()
2881 for values %{delete $self->{refresh_hook}};
2803 } 2882 }
2804 2883
2805 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807 glClear GL_COLOR_BUFFER_BIT; 2886 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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