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.186 by root, Mon May 8 20:39:34 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->{parent} 395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
409 or return 1;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
428 }
429} 396}
430 397
431sub update { 398sub update {
432 my ($self) = @_; 399 my ($self) = @_;
433 400
… …
530 497
531 $self 498 $self
532} 499}
533 500
534sub add { 501sub add {
535 my ($self, $child) = @_; 502 my ($self, @widgets) = @_;
536 503
537 $child->set_parent ($self); 504 $_->set_parent ($self)
505 for @widgets;
538 506
539 use sort 'stable'; 507 use sort 'stable';
540 508
541 $self->{children} = [ 509 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 511 @{$self->{children}}, @widgets
544 ]; 512 ];
545 513
546 $child->check_size; 514 $self->check_size;
547 $self->update; 515 $self->update;
548} 516}
549 517
550sub children { 518sub children {
551 @{ $_[0]{children} } 519 @{ $_[0]{children} }
… …
699 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
700 668
701 my $tex = $self->{texture} 669 my $tex = $self->{texture}
702 or return; 670 or return;
703 671
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 672 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 674 glColor 0, 0, 0, 1;
709 675
710 $tex->draw_quad (0, 0, $w, $h); 676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 677
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
714} 679}
715 680
716############################################################################# 681#############################################################################
717 682
… …
741 $self->{view_y} = int $y; 706 $self->{view_y} = int $y;
742 707
743 $self->update; 708 $self->update;
744} 709}
745 710
746# 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
747sub _topleft { 712sub coord2local {
748 my ($self, $x, $y) = @_; 713 my ($self, $x, $y) = @_;
749 714
750 $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)
751} 725}
752 726
753sub find_widget { 727sub find_widget {
754 my ($self, $x, $y) = @_; 728 my ($self, $x, $y) = @_;
755 729
… …
1237} 1211}
1238 1212
1239sub size_allocate { 1213sub size_allocate {
1240 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1241 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1242 my $children = $self->{children}; 1218 my $children = $self->{children};
1243 1219
1244 my @h = map $_->{req_h}, @$children; 1220 my @h = map $_->{req_h}, @$children;
1245 1221
1246 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
… …
1285 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1286 1262
1287 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1289 #font => default_font 1265 #font => default_font
1266 #text => initial text
1267 #markup => initial narkup
1268 layout => (new CFClient::Layout),
1290 fontsize => 1, 1269 fontsize => 1,
1291 text => "",
1292 align => -1, 1270 align => -1,
1293 valign => -1, 1271 valign => -1,
1294 padding => 2, 1272 padding => 2,
1295 layout => new CFClient::Layout,
1296 can_events => 0, 1273 can_events => 0,
1297 %arg 1274 %arg
1298 ); 1275 );
1299 1276
1300 if (exists $self->{template}) { 1277 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1278 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1279 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1280 $self->{template} = $layout;
1304 } 1281 }
1305 1282
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1307 $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 }
1308 1288
1309 $self 1289 $self
1310} 1290}
1311 1291
1312sub escape { 1292sub escape {
… …
1330 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1331 1311
1332 return if $self->{text} eq "T$text"; 1312 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1313 $self->{text} = "T$text";
1334 1314
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1336 1317
1337 delete $self->{texture};
1338 $self->update; 1318 $self->update;
1339 $self->check_size; 1319 $self->check_size;
1340} 1320}
1341 1321
1342sub set_markup { 1322sub set_markup {
1343 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1344 1324
1345 return if $self->{text} eq "M$markup"; 1325 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1326 $self->{text} = "M$markup";
1347 1327
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1349 1332
1350 delete $self->{texture};
1351 $self->update; 1333 $self->update;
1352 $self->check_size; 1334 $self->check_size;
1353} 1335}
1354 1336
1355sub size_request { 1337sub size_request {
… …
1395 1377
1396sub _draw { 1378sub _draw {
1397 my ($self) = @_; 1379 my ($self) = @_;
1398 1380
1399 my $tex = $self->{texture} ||= do { 1381 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1383 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1402 $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
1403 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
1404 }; 1398 };
1405 1399
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1402
1403 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1404 glColor @{$self->{fg}};
1412
1413 $self->{ox} = int (
1414 $self->{align} < 0 ? $self->{padding}
1415 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416 : ($self->{w} - $tex->{w}) * 0.5
1417 );
1418
1419 $self->{oy} = int (
1420 $self->{valign} < 0 ? $self->{padding}
1421 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422 : ($self->{h} - $tex->{h}) * 0.5
1423 );
1424
1425 $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 }
1426 1409
1427 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1411}
1430 1412
1431############################################################################# 1413#############################################################################
1432 1414
1433package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
… …
1468 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1469 1451
1470 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1471} 1453}
1472 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
1473sub get_text { 1464sub get_text {
1474 $_[0]{text} 1465 $_[0]{text}
1475} 1466}
1476 1467
1477sub size_request { 1468sub size_request {
… …
1484 1475
1485sub size_allocate { 1476sub size_allocate {
1486 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1487 1478
1488 $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
1489}
1490
1491sub set_text {
1492 my ($self, $text) = @_;
1493
1494 $self->{cursor} = length $text;
1495 $self->_set_text ($text);
1496 $self->update;
1497} 1480}
1498 1481
1499sub key_down { 1482sub key_down {
1500 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1501 1484
… …
2507sub new { 2490sub new {
2508 my $class = shift; 2491 my $class = shift;
2509 2492
2510 my %args = @_; 2493 my %args = @_;
2511 2494
2512 my $item = $args{item}; 2495 my $item = delete $args{item};
2513 2496
2514 my $desc = $item->{nrof} < 2 2497 my $desc = $item->{nrof} < 2
2515 ? $item->{name} 2498 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}"; 2499 : "$item->{nrof} $item->{name_pl}";
2517 2500
… …
2546 2529
2547 1 2530 1
2548 }, 2531 },
2549 %args 2532 %args
2550 ); 2533 );
2534
2551 $self->add(new CFClient::UI::Face 2535 $self->add (new CFClient::UI::Face
2552 can_events => 0, 2536 can_events => 0,
2553 face => $item->{face}, 2537 face => $item->{face},
2554 anim => $item->{anim}, 2538 anim => $item->{anim},
2555 animspeed => $item->{animspeed}); 2539 animspeed => $item->{animspeed},
2540 );
2541
2556 $self->add(new CFClient::UI::Label 2542 $self->add (new CFClient::UI::Label
2557 can_events => 0, 2543 can_events => 0,
2558 text => $desc); 2544 text => $desc,
2545 );
2559 2546
2560 $self 2547 $self
2561} 2548}
2562 2549
2563############################################################################# 2550#############################################################################
… …
2590 for my $item (@items) { 2577 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2 2578 my $desc = $item->{nrof} < 2
2592 ? $item->{name} 2579 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}"; 2580 : "$item->{nrof} $item->{name_pl}";
2594 2581
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2582 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2596 } 2583 }
2597 2584
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2585# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599} 2586}
2600 2587
… …
2675 } 2662 }
2676} 2663}
2677 2664
2678############################################################################# 2665#############################################################################
2679 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
2680package CFClient::UI::Root; 2732package CFClient::UI::Root;
2681 2733
2682our @ISA = CFClient::UI::Container::; 2734our @ISA = CFClient::UI::Container::;
2683 2735
2684use CFClient::OpenGL; 2736use CFClient::OpenGL;
2685 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
2686sub check_size { 2753sub check_size {
2687 my ($self) = @_; 2754 my ($self) = @_;
2688 2755
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 2756 $self->size_allocate ($self->{w}, $self->{h})
2757 if $self->{w};
2690} 2758}
2691 2759
2692sub size_request { 2760sub size_request {
2693 my ($self) = @_; 2761 my ($self) = @_;
2694 2762
… …
2702 my $old_h = $self->{old_h}; 2770 my $old_h = $self->{old_h};
2703 2771
2704 if ($old_w && $old_h) { 2772 if ($old_w && $old_h) {
2705 for my $child ($self->children) { 2773 for my $child ($self->children) {
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w; 2774 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707 $child->{w} = int 0.5 + $child->{req_w} * $w / $old_w; 2775 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w}; 2776 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w}; 2777 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h; 2778 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h; 2779 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712 $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};
2713 $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};
2714 } 2782 }
2715 } 2783 }
2716 2784
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2719}
2720
2721sub configure {
2722 my ($self, $x, $y, $w, $h) = @_;
2723
2724 $self->SUPER::configure ($x, $y, $w, $h);
2725
2726 for my $child ($self->children) { 2785 for my $child ($self->children) {
2727 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)};
2728 2787
2729 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2788 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2730 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2789 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2731 $child->configure ($X, $Y, $W, $H); 2790 $child->configure ($X, $Y, $W, $H);
2732 } 2791 }
2733}
2734 2792
2735sub _topleft { 2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795}
2796
2797sub coord2local {
2736 my ($self, $x, $y) = @_; 2798 my ($self, $x, $y) = @_;
2737 2799
2738 ($x, $y) 2800 ($x, $y)
2739} 2801}
2740 2802
2803sub coord2global {
2804 my ($self, $x, $y) = @_;
2805
2806 ($x, $y)
2807}
2808
2741sub update { 2809sub update {
2742 my ($self) = @_; 2810 my ($self) = @_;
2743 2811
2744 $self->check_size; 2812 $self->check_size;
2745 ::refresh (); 2813 $::WANT_REFRESH++;
2746} 2814}
2747 2815
2748sub add { 2816sub add {
2749 my ($self, $child) = @_; 2817 my ($self, $child) = @_;
2750 2818
2751 # integerize window positions 2819 # integerise window positions
2752 $child->{x} = int $child->{x}; 2820 $child->{x} = int $child->{x};
2753 $child->{y} = int $child->{y}; 2821 $child->{y} = int $child->{y};
2754 2822
2755 $self->SUPER::add ($child); 2823 $self->SUPER::add ($child);
2756} 2824}
… …
2759 my ($self, $id, $cb) = @_; 2827 my ($self, $id, $cb) = @_;
2760 2828
2761 $self->{refresh_hook}{$id} = $cb; 2829 $self->{refresh_hook}{$id} = $cb;
2762} 2830}
2763 2831
2764sub draw { 2832sub draw {
2765 my ($self) = @_; 2833 my ($self) = @_;
2766 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
2767 while (my $rcb = delete $self->{refresh_hook}) { 2879 while ($self->{refresh_hook}) {
2768 $_->() for values %$rcb; 2880 $_->()
2881 for values %{delete $self->{refresh_hook}};
2769 } 2882 }
2770 2883
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 2886 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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