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.176 by root, Tue Apr 25 12:10:58 2006 UTC vs.
Revision 1.193 by root, Wed May 10 21:12:26 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 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $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
… …
395 381
396sub set_parent { 382sub set_parent {
397 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
398 384
399 Scalar::Util::weaken ($self->{parent} = $parent); 385 Scalar::Util::weaken ($self->{parent} = $parent);
386
387 $self->check_size
388 unless exists $self->{req_w};
400} 389}
401 390
402sub check_size { 391sub check_size {
403 my ($self) = @_; 392 my ($self) = @_;
404 393
405 $self->{parent} 394 $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} 395}
427 396
428sub update { 397sub update {
429 my ($self) = @_; 398 my ($self) = @_;
430 399
… …
527 496
528 $self 497 $self
529} 498}
530 499
531sub add { 500sub add {
532 my ($self, $child) = @_; 501 my ($self, @widgets) = @_;
533 502
534 $child->set_parent ($self); 503 $_->set_parent ($self)
504 for @widgets;
535 505
536 use sort 'stable'; 506 use sort 'stable';
537 507
538 $self->{children} = [ 508 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 509 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 510 @{$self->{children}}, @widgets
541 ]; 511 ];
542 512
543 $child->check_size; 513 $self->check_size;
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
… …
904 $tex[1]->draw_quad (0, 0, $w, $border); 960 $tex[1]->draw_quad (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 961 $tex[3]->draw_quad (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 963 $tex[4]->draw_quad (0, $h - $border, $w, $border);
908 964
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
909 my $bg = $tex[0]; 966 my $bg = $tex[0];
910 967
911 # TODO: repeat texture not scale 968 # TODO: repeat texture not scale
912 my $rep_x = $cw / $bg->{w}; 969 my $rep_x = $cw / $bg->{w};
913 my $rep_y = $ch / $bg->{h}; 970 my $rep_y = $ch / $bg->{h};
914 971
915 glColor @{ $self->{bg} }; 972 glColor @{ $self->{bg} };
916 973
917 $bg->{s} = $rep_x; 974 $bg->{s} = $rep_x;
918 $bg->{t} = $rep_y; 975 $bg->{t} = $rep_y;
919 $bg->{wrap_mode} = 1; 976 $bg->{wrap_mode} = 1;
920 $bg->draw_quad ($border, $border, $cw, $ch); 977 $bg->draw_quad ($border, $border, $cw, $ch);
921 978
922 glDisable GL_TEXTURE_2D; 979 glDisable GL_TEXTURE_2D;
923 glDisable GL_BLEND; 980 glDisable GL_BLEND;
981 }
924 982
925 $self->{title}->draw if $self->{title}; 983 $self->{title}->draw if $self->{title};
984
926 $self->child->draw; 985 $self->child->draw;
927} 986}
928 987
929############################################################################# 988#############################################################################
930 989
… …
1153 ) 1212 )
1154} 1213}
1155 1214
1156sub size_allocate { 1215sub size_allocate {
1157 my ($self, $w, $h) = @_; 1216 my ($self, $w, $h) = @_;
1217
1218 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1158 1219
1159 my $children = $self->{children}; 1220 my $children = $self->{children};
1160 1221
1161 my @h = map $_->{req_h}, @$children; 1222 my @h = map $_->{req_h}, @$children;
1162 1223
… …
1241 1302
1242 delete $self->{texture}; 1303 delete $self->{texture};
1243 $self->SUPER::update; 1304 $self->SUPER::update;
1244} 1305}
1245 1306
1246sub reconfigure {
1247 my ($self) = @_;
1248
1249 delete $self->{texture};
1250}
1251
1252sub set_text { 1307sub set_text {
1253 my ($self, $text) = @_; 1308 my ($self, $text) = @_;
1254 1309
1255 return if $self->{text} eq "T$text"; 1310 return if $self->{text} eq "T$text";
1256 $self->{text} = "T$text"; 1311 $self->{text} = "T$text";
1257 1312
1258 $self->{layout}->set_text ($text); 1313 $self->{layout}->set_text ($text);
1259 1314
1260 delete $self->{texture};
1261 $self->update; 1315 $self->update;
1262 $self->check_size; 1316 $self->check_size;
1263} 1317}
1264 1318
1265sub set_markup { 1319sub set_markup {
… …
1268 return if $self->{text} eq "M$markup"; 1322 return if $self->{text} eq "M$markup";
1269 $self->{text} = "M$markup"; 1323 $self->{text} = "M$markup";
1270 1324
1271 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1272 1326
1273 delete $self->{texture};
1274 $self->update; 1327 $self->update;
1275 $self->check_size; 1328 $self->check_size;
1276} 1329}
1277 1330
1278sub size_request { 1331sub size_request {
… …
1309sub set_fontsize { 1362sub set_fontsize {
1310 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1311 1364
1312 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1313 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1314 $self->check_size; 1369 $self->check_size;
1315 $self->update;
1316} 1370}
1317 1371
1318sub _draw { 1372sub _draw {
1319 my ($self) = @_; 1373 my ($self) = @_;
1320 1374
… …
1954 # TODO: calculations are off 2008 # TODO: calculations are off
1955 my $self = $class->SUPER::new ( 2009 my $self = $class->SUPER::new (
1956 fg => [1, 1, 1], 2010 fg => [1, 1, 1],
1957 active_fg => [0, 0, 0], 2011 active_fg => [0, 0, 0],
1958 range => [0, 0, 100, 10], 2012 range => [0, 0, 100, 10],
1959 req_w => 20, 2013 req_w => $::WIDTH / 80,
1960 req_h => 20, 2014 req_h => $::WIDTH / 80,
1961 vertical => 0, 2015 vertical => 0,
1962 can_hover => 1, 2016 can_hover => 1,
1963 inner_pad => 5, 2017 inner_pad => 5,
1964 @_ 2018 @_
1965 ); 2019 );
… …
2399 2453
2400sub size_request { 2454sub size_request {
2401 (32, 8) 2455 (32, 8)
2402} 2456}
2403 2457
2404sub draw { 2458sub _draw {
2405 my ($self) = @_; 2459 my ($self) = @_;
2406 2460
2461 return unless $::CONN;#d# manage and cache textures differently
2407 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2462 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2408 2463
2464 # TODO animation
2409 if ($tex) { 2465 if ($tex) {
2410 glEnable GL_BLEND; 2466 glEnable GL_BLEND;
2411 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2467 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2412 glEnable GL_TEXTURE_2D; 2468 glEnable GL_TEXTURE_2D;
2413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2418 } 2474 }
2419} 2475}
2420 2476
2421############################################################################# 2477#############################################################################
2422 2478
2479package CFClient::UI::InventoryItem;
2480
2481our @ISA = CFClient::UI::HBox::;
2482
2483sub new {
2484 my $class = shift;
2485
2486 my %args = @_;
2487
2488 my $item = delete $args{item};
2489
2490 my $desc = $item->{nrof} < 2
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494
2495 my $self = $class->SUPER::new (
2496 can_hover => 1,
2497 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_;
2502
2503 # todo: maybe put examine on 1? but should just be a tooltip :(
2504 if ($ev->{button} == 1) {
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2506 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512 [
2513 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514 sub { $::CONN->send ("lock $item->{tag}") },
2515 ],
2516 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519 ],
2520 )->popup ($ev);
2521 }
2522
2523 1
2524 },
2525 %args
2526 );
2527
2528 $self->add (new CFClient::UI::Face
2529 can_events => 0,
2530 face => $item->{face},
2531 anim => $item->{anim},
2532 animspeed => $item->{animspeed},
2533 );
2534
2535 $self->add (new CFClient::UI::Label
2536 can_events => 0,
2537 text => $desc,
2538 );
2539
2540 $self
2541}
2542
2543#############################################################################
2544
2545package CFClient::UI::Inventory;
2546
2547our @ISA = CFClient::UI::ScrolledWindow::;
2548
2549sub new {
2550 my $class = shift;
2551
2552 my $self = $class->SUPER::new (
2553 scrolled => (new CFClient::UI::VBox),
2554 @_,
2555 );
2556
2557 $self
2558}
2559
2560sub set_items {
2561 my ($self, $items) = @_;
2562
2563 $self->{scrolled}->clear;
2564 return unless $items;
2565
2566 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2567
2568 $self->{real_items} = \@items;
2569
2570 for my $item (@items) {
2571 my $desc = $item->{nrof} < 2
2572 ? $item->{name}
2573 : "$item->{nrof} $item->{name_pl}";
2574
2575 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2576 }
2577
2578# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2579}
2580
2581sub size_request {
2582 my ($self) = @_;
2583 ($self->{req_w}, $self->{req_h});
2584}
2585
2586#############################################################################
2587
2588package CFClient::UI::Menu;
2589
2590our @ISA = CFClient::UI::FancyFrame::;
2591
2592use CFClient::OpenGL;
2593
2594sub new {
2595 my $class = shift;
2596
2597 my $self = $class->SUPER::new (
2598 items => [],
2599 z => 100,
2600 @_,
2601 );
2602
2603 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2604
2605 for my $item (@{ $self->{items} }) {
2606 my ($widget, $cb) = @$item;
2607
2608 # handle various types of items, only text for now
2609 if (!ref $widget) {
2610 $widget = new CFClient::UI::Label
2611 can_hover => 1,
2612 can_events => 1,
2613 text => $widget;
2614 }
2615
2616 $self->{item}{$widget} = $item;
2617
2618 $self->{vbox}->add ($widget);
2619 }
2620
2621 $self
2622}
2623
2624# popup given the event (must be a mouse button down event currently)
2625sub popup {
2626 my ($self, $ev) = @_;
2627
2628 $self->emit ("popdown");
2629
2630 # maybe save $GRAB? must be careful about events...
2631 $GRAB = $self;
2632 $self->{button} = $ev->{button};
2633
2634 $self->show;
2635 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2636}
2637
2638sub mouse_motion {
2639 my ($self, $ev, $x, $y) = @_;
2640
2641 # TODO: should use vbox->find_widget or so
2642 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2643 $self->{hover} = $self->{item}{$HOVER};
2644}
2645
2646sub button_up {
2647 my ($self, $ev, $x, $y) = @_;
2648
2649 if ($ev->{button} == $self->{button}) {
2650 undef $GRAB;
2651 $self->hide;
2652
2653 $self->emit ("popdown");
2654 $self->{hover}[1]->() if $self->{hover};
2655 }
2656}
2657
2658#############################################################################
2659
2423package CFClient::UI::Root; 2660package CFClient::UI::Root;
2424 2661
2425our @ISA = CFClient::UI::Container::; 2662our @ISA = CFClient::UI::Container::;
2426 2663
2427use CFClient::OpenGL; 2664use CFClient::OpenGL;
2428 2665
2429sub check_size { 2666sub new {
2430 my ($self) = @_; 2667 my $class = shift;
2431 2668
2432 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2669 $class->SUPER::new (
2433} 2670 @_,
2434 2671 )
2435sub size_request {
2436 ($::WIDTH, $::HEIGHT)
2437} 2672}
2438 2673
2439sub configure { 2674sub configure {
2440 my ($self, $x, $y, $w, $h) = @_; 2675 my ($self, $x, $y, $w, $h) = @_;
2441 2676
2442 $self->SUPER::configure ($x, $y, $w, $h); 2677 $self->{w} = $w;
2678 $self->{h} = $h;
2679}
2443 2680
2681sub check_size {
2682 my ($self) = @_;
2683
2684 $self->size_allocate ($self->{w}, $self->{h})
2685 if $self->{w};
2686}
2687
2688sub size_request {
2689 my ($self) = @_;
2690
2691 ($self->{w}, $self->{h})
2692}
2693
2694sub size_allocate {
2695 my ($self, $w, $h) = @_;
2696
2697 my $old_w = $self->{old_w};
2698 my $old_h = $self->{old_h};
2699
2700 if ($old_w && $old_h) {
2701 for my $child ($self->children) {
2702 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2703 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2704 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2705 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2706 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2707 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2708 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2709 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2710 }
2711 }
2712
2444 for my $child (@{$self->{children}}) { 2713 for my $child ($self->children) {
2445 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2714 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2446 2715
2447 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2716 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2448 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2717 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2449 $child->configure ($X, $Y, $W,$H); 2718 $child->configure ($X, $Y, $W, $H);
2450 } 2719 }
2451}
2452 2720
2453sub _topleft { 2721 $self->{old_w} = $w;
2722 $self->{old_h} = $h;
2723}
2724
2725sub coord2local {
2454 my ($self, $x, $y) = @_; 2726 my ($self, $x, $y) = @_;
2455 2727
2456 ($x, $y) 2728 ($x, $y)
2457} 2729}
2458 2730
2731sub coord2global {
2732 my ($self, $x, $y) = @_;
2733
2734 ($x, $y)
2735}
2736
2459sub update { 2737sub update {
2460 my ($self) = @_; 2738 my ($self) = @_;
2461 2739
2462 $self->check_size; 2740 $self->check_size;
2463 ::refresh (); 2741 $::WANT_REFRESH++;
2464} 2742}
2465 2743
2466sub add { 2744sub add {
2467 my ($self, $child) = @_; 2745 my ($self, $child) = @_;
2468 2746
2469 # integerize window positions 2747 # integerise window positions
2470 $child->{x} = int $child->{x}; 2748 $child->{x} = int $child->{x};
2471 $child->{y} = int $child->{y}; 2749 $child->{y} = int $child->{y};
2472 2750
2473 $self->SUPER::add ($child); 2751 $self->SUPER::add ($child);
2474} 2752}
… …
2477 my ($self, $id, $cb) = @_; 2755 my ($self, $id, $cb) = @_;
2478 2756
2479 $self->{refresh_hook}{$id} = $cb; 2757 $self->{refresh_hook}{$id} = $cb;
2480} 2758}
2481 2759
2482sub draw { 2760sub draw {
2483 my ($self) = @_; 2761 my ($self) = @_;
2484 2762
2763 if ($self->{check_size}) {
2764 my @queue = ([], []);
2765
2766 for (;;) {
2767 if ($self->{check_size}) {
2768 # heuristic: check containers last
2769 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2770 for values %{delete $self->{check_size}}
2771 }
2772
2773 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2774
2775 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776 ? @$widget{qw(user_w user_h)}
2777 : $widget->size_request;
2778
2779 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2780 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781
2782 $widget->{req_w} = $w;
2783 $widget->{req_h} = $h;
2784
2785 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2786
2787 $widget->{parent}->check_size
2788 if $widget->{parent};
2789 }
2790 }
2791 }
2792
2793 while ($self->{size_alloc}) {
2794 for (values %{delete $self->{size_alloc}}) {
2795 my ($widget, $w, $h) = @$_;
2796
2797 $w = 0 if $w < 0;
2798 $h = 0 if $h < 0;
2799
2800 $widget->{w} = $w;
2801 $widget->{h} = $h;
2802 $widget->size_allocate ($w, $h);
2803 $widget->emit (size_allocate => $w, $h);
2804 }
2805 }
2806
2485 while (my $rcb = delete $self->{refresh_hook}) { 2807 while ($self->{refresh_hook}) {
2486 $_->() for values %$rcb; 2808 $_->()
2809 for values %{delete $self->{refresh_hook}};
2487 } 2810 }
2488 2811
2489 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2812 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2490 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2491 glClear GL_COLOR_BUFFER_BIT; 2814 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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