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.177 by root, Tue Apr 25 13:08:17 2006 UTC vs.
Revision 1.191 by root, Tue May 9 22:27:53 2006 UTC

… …
232 $self->{y} = $y; 232 $self->{y} = $y;
233 $self->update; 233 $self->update;
234 } 234 }
235 235
236 if ($self->{w} != $w || $self->{h} != $h) { 236 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 238 }
243} 239}
244 240
245sub size_allocate { 241sub size_allocate {
246 # nothing to be done 242 # nothing to be done
247} 243}
248 244
249sub children { 245sub children {
250} 246}
251 247
252# call when resoltuion changes etc. 248# call when resolution changes etc.
253sub reconfigure { 249sub reconfigure {
254 my ($self) = @_; 250 my ($self) = @_;
255 251
256 $_->reconfigure 252 $_->reconfigure
257 for $self->children; 253 for $self->children;
258 254
259 $_->check_size; 255 $self->check_size;
256 $self->size_allocate ($self->{w}, $self->{h});
257 $self->update;
260} 258}
261 259
262sub set_max_size { 260sub set_max_size {
263 my ($self, $w, $h) = @_; 261 my ($self, $w, $h) = @_;
264 262
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 263 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 264 delete $self->{max_h}; $self->{max_h} = $h if $h;
267}
268
269# return top left coordinates
270sub _topleft {
271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
275
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
277} 265}
278 266
279# translate global coordinates to local coordinate system 267# translate global coordinates to local coordinate system
280sub coord2local { 268sub coord2local {
281 my ($self, $x, $y) = @_; 269 my ($self, $x, $y) = @_;
282 270
283 my ($X, $Y) = $self->_topleft; 271 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 272}
286 273
287# translate local coordinates to global coordinate system 274# translate local coordinates to global coordinate system
288sub coord2global { 275sub coord2global {
289 my ($self, $x, $y) = @_; 276 my ($self, $x, $y) = @_;
290 277
291 my ($X, $Y) = $self->_topleft; 278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 279}
294 280
295sub focus_in { 281sub focus_in {
296 my ($self) = @_; 282 my ($self) = @_;
297 283
… …
394} 380}
395 381
396sub set_parent { 382sub set_parent {
397 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
398 384
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
399 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
400} 387}
401 388
402sub check_size { 389sub check_size {
403 my ($self) = @_; 390 my ($self) = @_;
404 391
405 $self->{parent} 392 $CFClient::UI::ROOT->{check_size}{$self} = $self;
406 or return 1;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 393}
427 394
428sub update { 395sub update {
429 my ($self) = @_; 396 my ($self) = @_;
430 397
… …
527 494
528 $self 495 $self
529} 496}
530 497
531sub add { 498sub add {
532 my ($self, $child) = @_; 499 my ($self, @widgets) = @_;
533 500
534 $child->set_parent ($self); 501 $_->set_parent ($self)
502 for @widgets;
535 503
536 use sort 'stable'; 504 use sort 'stable';
537 505
538 $self->{children} = [ 506 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 507 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 508 @{$self->{children}}, @widgets
541 ]; 509 ];
542 510
543 $child->check_size; 511 $_->check_size
512 for @widgets;
513
514 $self->update;
544} 515}
545 516
546sub children { 517sub children {
547 @{ $_[0]{children} } 518 @{ $_[0]{children} }
548} 519}
… …
567 538
568 for (@$children) { 539 for (@$children) {
569 delete $_->{parent}; 540 delete $_->{parent};
570 $_->hide; 541 $_->hide;
571 } 542 }
543
544 $self->check_size;
545 $self->update;
572} 546}
573 547
574sub find_widget { 548sub find_widget {
575 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
576 550
… …
662 636
663 $self->SUPER::size_allocate ($w, $h); 637 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 638 $self->update;
665} 639}
666 640
641sub _render {
642 $_[0]{children}[0]->draw;
643}
644
667sub render_child { 645sub render_child {
668 my ($self) = @_; 646 my ($self) = @_;
669 647
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 649 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 650 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 651
652 $self->_render;
674# glColorMask 1, 1, 1, 0; 653# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND; 654# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0; 656# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 657# glCopyPixels 0, 0, $self->{w}, $self->{h};
… …
705 684
706package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
707 686
708our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
709 688
710sub new { die }
711
712sub size_request { 689sub size_request {
713 my ($self) = @_; 690 my ($self) = @_;
714 691
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
717 694
718 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
719} 696}
720 697
721sub _draw { 698sub size_allocate {
722 my ($self) = @_; 699 my ($self, $w, $h) = @_;
723 700
724 $self->{children}[1]->draw; 701 $self->update;
725} 702}
726 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
706
707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
709
710 $self->update;
711}
712
713# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local {
715 my ($self, $x, $y) = @_;
716
717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
727}
728
729sub find_widget {
730 my ($self, $x, $y) = @_;
731
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y)
738 }
739}
740
741sub _render {
742 my ($self) = @_;
743
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745
746 $self->SUPER::_render;
747}
748
749#############################################################################
750
751package CFClient::UI::ScrolledWindow;
752
753our @ISA = CFClient::UI::HBox::;
754
755sub new {
756 my $class = shift;
757
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
768 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort),
770 slider => $slider,
771 @_,
772 );
773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
778 $self
779}
780
781#TODO# update range on size_allocate depeneing on child
782# update viewport offset on scroll
727 783
728############################################################################# 784#############################################################################
729 785
730package CFClient::UI::Frame; 786package CFClient::UI::Frame;
731 787
… …
1244 1300
1245 delete $self->{texture}; 1301 delete $self->{texture};
1246 $self->SUPER::update; 1302 $self->SUPER::update;
1247} 1303}
1248 1304
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1305sub set_text {
1256 my ($self, $text) = @_; 1306 my ($self, $text) = @_;
1257 1307
1258 return if $self->{text} eq "T$text"; 1308 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1309 $self->{text} = "T$text";
1260 1310
1261 $self->{layout}->set_text ($text); 1311 $self->{layout}->set_text ($text);
1262 1312
1263 delete $self->{texture};
1264 $self->update; 1313 $self->update;
1265 $self->check_size; 1314 $self->check_size;
1266} 1315}
1267 1316
1268sub set_markup { 1317sub set_markup {
… …
1271 return if $self->{text} eq "M$markup"; 1320 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1321 $self->{text} = "M$markup";
1273 1322
1274 $self->{layout}->set_markup ($markup); 1323 $self->{layout}->set_markup ($markup);
1275 1324
1276 delete $self->{texture};
1277 $self->update; 1325 $self->update;
1278 $self->check_size; 1326 $self->check_size;
1279} 1327}
1280 1328
1281sub size_request { 1329sub size_request {
… …
1312sub set_fontsize { 1360sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1361 my ($self, $fontsize) = @_;
1314 1362
1315 $self->{fontsize} = $fontsize; 1363 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1364 delete $self->{texture};
1365
1366 $self->update;
1317 $self->check_size; 1367 $self->check_size;
1318 $self->update;
1319} 1368}
1320 1369
1321sub _draw { 1370sub _draw {
1322 my ($self) = @_; 1371 my ($self) = @_;
1323 1372
… …
1957 # TODO: calculations are off 2006 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1960 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1961 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1962 req_w => 20, 2011 req_w => $::WIDTH / 80,
1963 req_h => 20, 2012 req_h => $::WIDTH / 80,
1964 vertical => 0, 2013 vertical => 0,
1965 can_hover => 1, 2014 can_hover => 1,
1966 inner_pad => 5, 2015 inner_pad => 5,
1967 @_ 2016 @_
1968 ); 2017 );
… …
2402 2451
2403sub size_request { 2452sub size_request {
2404 (32, 8) 2453 (32, 8)
2405} 2454}
2406 2455
2407sub draw { 2456sub _draw {
2408 my ($self) = @_; 2457 my ($self) = @_;
2409 2458
2459 return unless $::CONN;#d# manage and cache textures differently
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2411 2461
2462 # TODO animation
2412 if ($tex) { 2463 if ($tex) {
2413 glEnable GL_BLEND; 2464 glEnable GL_BLEND;
2414 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2415 glEnable GL_TEXTURE_2D; 2466 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2421 } 2472 }
2422} 2473}
2423 2474
2424############################################################################# 2475#############################################################################
2425 2476
2477package CFClient::UI::InventoryItem;
2478
2479our @ISA = CFClient::UI::HBox::;
2480
2481sub new {
2482 my $class = shift;
2483
2484 my %args = @_;
2485
2486 my $item = $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new (
2494 can_hover => 1,
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525 $self->add(new CFClient::UI::Face
2526 can_events => 0,
2527 face => $item->{face},
2528 anim => $item->{anim},
2529 animspeed => $item->{animspeed});
2530 $self->add(new CFClient::UI::Label
2531 can_events => 0,
2532 text => $desc);
2533
2534 $self
2535}
2536
2537#############################################################################
2538
2539package CFClient::UI::Inventory;
2540
2541our @ISA = CFClient::UI::ScrolledWindow::;
2542
2543sub new {
2544 my $class = shift;
2545
2546 my $self = $class->SUPER::new (
2547 scrolled => (new CFClient::UI::VBox),
2548 @_,
2549 );
2550
2551 $self
2552}
2553
2554sub set_items {
2555 my ($self, $items) = @_;
2556
2557 $self->{scrolled}->clear;
2558 return unless $items;
2559
2560 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2561
2562 $self->{real_items} = \@items;
2563
2564 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2
2566 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}";
2568
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2570 }
2571
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573}
2574
2575sub size_request {
2576 my ($self) = @_;
2577 ($self->{req_w}, $self->{req_h});
2578}
2579
2580#############################################################################
2581
2582package CFClient::UI::Menu;
2583
2584our @ISA = CFClient::UI::FancyFrame::;
2585
2586use CFClient::OpenGL;
2587
2588sub new {
2589 my $class = shift;
2590
2591 my $self = $class->SUPER::new (
2592 items => [],
2593 z => 100,
2594 @_,
2595 );
2596
2597 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2598
2599 for my $item (@{ $self->{items} }) {
2600 my ($widget, $cb) = @$item;
2601
2602 # handle various types of items, only text for now
2603 if (!ref $widget) {
2604 $widget = new CFClient::UI::Label
2605 can_hover => 1,
2606 can_events => 1,
2607 text => $widget;
2608 }
2609
2610 $self->{item}{$widget} = $item;
2611
2612 $self->{vbox}->add ($widget);
2613 }
2614
2615 $self
2616}
2617
2618# popup given the event (must be a mouse button down event currently)
2619sub popup {
2620 my ($self, $ev) = @_;
2621
2622 $self->emit ("popdown");
2623
2624 # maybe save $GRAB? must be careful about events...
2625 $GRAB = $self;
2626 $self->{button} = $ev->{button};
2627
2628 $self->show;
2629 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2630}
2631
2632sub mouse_motion {
2633 my ($self, $ev, $x, $y) = @_;
2634
2635 # TODO: should use vbox->find_widget or so
2636 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2637 $self->{hover} = $self->{item}{$HOVER};
2638}
2639
2640sub button_up {
2641 my ($self, $ev, $x, $y) = @_;
2642
2643 if ($ev->{button} == $self->{button}) {
2644 undef $GRAB;
2645 $self->hide;
2646
2647 $self->emit ("popdown");
2648 $self->{hover}[1]->() if $self->{hover};
2649 }
2650}
2651
2652#############################################################################
2653
2426package CFClient::UI::Root; 2654package CFClient::UI::Root;
2427 2655
2428our @ISA = CFClient::UI::Container::; 2656our @ISA = CFClient::UI::Container::;
2429 2657
2430use CFClient::OpenGL; 2658use CFClient::OpenGL;
2431 2659
2432sub check_size { 2660sub new {
2433 my ($self) = @_; 2661 my $class = shift;
2434 2662
2435 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2663 $class->SUPER::new (
2436} 2664 @_,
2437 2665 )
2438sub size_request {
2439 ($::WIDTH, $::HEIGHT)
2440} 2666}
2441 2667
2442sub configure { 2668sub configure {
2443 my ($self, $x, $y, $w, $h) = @_; 2669 my ($self, $x, $y, $w, $h) = @_;
2444 2670
2445 $self->SUPER::configure ($x, $y, $w, $h); 2671 $self->{w} = $w;
2672 $self->{h} = $h;
2673}
2446 2674
2675sub check_size {
2676 my ($self) = @_;
2677
2678 $self->size_allocate ($self->{w}, $self->{h})
2679 if $self->{w};
2680}
2681
2682sub size_request {
2683 my ($self) = @_;
2684
2685 ($self->{w}, $self->{h})
2686}
2687
2688sub size_allocate {
2689 my ($self, $w, $h) = @_;
2690
2691 my $old_w = $self->{old_w};
2692 my $old_h = $self->{old_h};
2693
2694 if ($old_w && $old_h) {
2695 for my $child ($self->children) {
2696 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704 }
2705 }
2706
2447 for my $child (@{$self->{children}}) { 2707 for my $child ($self->children) {
2448 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2708 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2449 2709
2450 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2710 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2451 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2711 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2452 $child->configure ($X, $Y, $W,$H); 2712 $child->configure ($X, $Y, $W, $H);
2453 } 2713 }
2454}
2455 2714
2456sub _topleft { 2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717}
2718
2719sub coord2local {
2457 my ($self, $x, $y) = @_; 2720 my ($self, $x, $y) = @_;
2458 2721
2459 ($x, $y) 2722 ($x, $y)
2460} 2723}
2461 2724
2725sub coord2global {
2726 my ($self, $x, $y) = @_;
2727
2728 ($x, $y)
2729}
2730
2462sub update { 2731sub update {
2463 my ($self) = @_; 2732 my ($self) = @_;
2464 2733
2465 $self->check_size; 2734 $self->check_size;
2466 ::refresh (); 2735 $::WANT_REFRESH++;
2467} 2736}
2468 2737
2469sub add { 2738sub add {
2470 my ($self, $child) = @_; 2739 my ($self, $child) = @_;
2471 2740
2472 # integerize window positions 2741 # integerise window positions
2473 $child->{x} = int $child->{x}; 2742 $child->{x} = int $child->{x};
2474 $child->{y} = int $child->{y}; 2743 $child->{y} = int $child->{y};
2475 2744
2476 $self->SUPER::add ($child); 2745 $self->SUPER::add ($child);
2477} 2746}
… …
2480 my ($self, $id, $cb) = @_; 2749 my ($self, $id, $cb) = @_;
2481 2750
2482 $self->{refresh_hook}{$id} = $cb; 2751 $self->{refresh_hook}{$id} = $cb;
2483} 2752}
2484 2753
2485sub draw { 2754sub draw {
2486 my ($self) = @_; 2755 my ($self) = @_;
2487 2756
2757 if ($self->{check_size}) {
2758 my @queue = ([], []);
2759
2760 for (;;) {
2761 if ($self->{check_size}) {
2762 # heuristic: check containers last
2763 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2764 for values %{delete $self->{check_size}}
2765 }
2766
2767 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2768
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770 ? @$widget{qw(user_w user_h)}
2771 : $widget->size_request;
2772
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2774 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h;
2776
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2778
2779 $widget->{parent}->check_size
2780 if $widget->{parent};
2781 }
2782 }
2783 }
2784
2785 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_;
2788
2789 $widget->{w} = $w;
2790 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h);
2793 }
2794 }
2795
2488 while (my $rcb = delete $self->{refresh_hook}) { 2796 while ($self->{refresh_hook}) {
2489 $_->() for values %$rcb; 2797 $_->()
2798 for values %{delete $self->{refresh_hook}};
2490 } 2799 }
2491 2800
2492 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2801 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2493 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2494 glClear GL_COLOR_BUFFER_BIT; 2803 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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