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.181 by root, Sat Apr 29 16:17:09 2006 UTC vs.
Revision 1.182 by root, Sun Apr 30 11:17:08 2006 UTC

… …
237 $self->{w} = $w; 237 $self->{w} = $w;
238 $self->{h} = $h; 238 $self->{h} = $h;
239 239
240 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
241 $self->update; 241 $self->update;
242 $self->emit (size_allocate => $w, $h);
242 } 243 }
243} 244}
244 245
245sub size_allocate { 246sub size_allocate {
246 # nothing to be done 247 # nothing to be done
247} 248}
248 249
249sub children { 250sub children {
250} 251}
251 252
252# call when resoltuion changes etc. 253# call when resolution changes etc.
253sub reconfigure { 254sub reconfigure {
254 my ($self) = @_; 255 my ($self) = @_;
255 256
256 $_->reconfigure 257 $_->reconfigure
257 for $self->children; 258 for $self->children;
… …
539 sort { $a->{z} <=> $b->{z} } 540 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 541 @{$self->{children}}, $child
541 ]; 542 ];
542 543
543 $child->check_size; 544 $child->check_size;
545 $self->update;
544} 546}
545 547
546sub children { 548sub children {
547 @{ $_[0]{children} } 549 @{ $_[0]{children} }
548} 550}
… …
567 569
568 for (@$children) { 570 for (@$children) {
569 delete $_->{parent}; 571 delete $_->{parent};
570 $_->hide; 572 $_->hide;
571 } 573 }
574
575 $self->check_size;
576 $self->update;
572} 577}
573 578
574sub find_widget { 579sub find_widget {
575 my ($self, $x, $y) = @_; 580 my ($self, $x, $y) = @_;
576 581
… …
662 667
663 $self->SUPER::size_allocate ($w, $h); 668 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 669 $self->update;
665} 670}
666 671
672sub _render {
673 $_[0]{children}[0]->draw;
674}
675
667sub render_child { 676sub render_child {
668 my ($self) = @_; 677 my ($self) = @_;
669 678
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 680 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 681 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 682
683 $self->_render;
674# glColorMask 1, 1, 1, 0; 684# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND; 685# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0; 687# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 688# glCopyPixels 0, 0, $self->{w}, $self->{h};
… …
705 715
706package CFClient::UI::ViewPort; 716package CFClient::UI::ViewPort;
707 717
708our @ISA = CFClient::UI::Window::; 718our @ISA = CFClient::UI::Window::;
709 719
710sub new { die }
711
712sub size_request { 720sub size_request {
713 my ($self) = @_; 721 my ($self) = @_;
714 722
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 723 @$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)}); 724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
717 725
718 @$self{qw(child_w child_h)} 726 @$self{qw(child_w child_h)}
719} 727}
720 728
721sub _draw { 729sub size_allocate {
722 my ($self) = @_; 730 my ($self, $w, $h) = @_;
723 731
724 $self->{children}[1]->draw; 732 $self->update;
725} 733}
726 734
735sub set_offset {
736 my ($self, $x, $y) = @_;
737
738 $self->{view_x} = int $x;
739 $self->{view_y} = int $y;
740
741 $self->update;
742}
743
744sub _render {
745 my ($self) = @_;
746
747 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
748
749 $self->SUPER::_render;
750}
751
752#############################################################################
753
754package CFClient::UI::ScrolledWindow;
755
756our @ISA = CFClient::UI::HBox::;
757
758sub new {
759 my $class = shift;
760
761 my $self;
762
763 my $slider = new CFClient::UI::Slider
764 vertical => 1,
765 range => [0, 0, 1, 0.01], # HACK fix
766 connect_changed => sub {
767 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
768 },
769 ;
770
771 $self = $class->SUPER::new (
772 vp => (new CFClient::UI::ViewPort),
773 slider => $slider,
774 @_,
775 );
776
777 $self->{vp}->add ($self->{scrolled});
778 $self->add ($self->{vp});
779 $self->add ($self->{slider});
780
781 $self
782}
783
784#TODO# update range on size_allocate depeneing on child
785# update viewport offset on scroll
727 786
728############################################################################# 787#############################################################################
729 788
730package CFClient::UI::Frame; 789package CFClient::UI::Frame;
731 790
… …
1957 # TODO: calculations are off 2016 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2017 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2018 fg => [1, 1, 1],
1960 active_fg => [0, 0, 0], 2019 active_fg => [0, 0, 0],
1961 range => [0, 0, 100, 10], 2020 range => [0, 0, 100, 10],
1962 req_w => 20, 2021 req_w => $::WIDTH / 80,
1963 req_h => 20, 2022 req_h => $::WIDTH / 80,
1964 vertical => 0, 2023 vertical => 0,
1965 can_hover => 1, 2024 can_hover => 1,
1966 inner_pad => 5, 2025 inner_pad => 5,
1967 @_ 2026 @_
1968 ); 2027 );
… …
2475} 2534}
2476 2535
2477sub mouse_motion { 2536sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2537 my ($self, $ev, $x, $y) = @_;
2479 2538
2480 # TODO: should use vbox->fdind_widget or so 2539 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2540 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2541 $self->{hover} = $self->{item}{$HOVER};
2483} 2542}
2484 2543
2485sub button_up { 2544sub button_up {
… …
2577 2636
2578############################################################################# 2637#############################################################################
2579 2638
2580package CFClient::UI::Inventory; 2639package CFClient::UI::Inventory;
2581 2640
2582our @ISA = CFClient::UI::Container::; 2641our @ISA = CFClient::UI::ScrolledWindow::;
2583
2584use CFClient::OpenGL;
2585 2642
2586sub new { 2643sub new {
2587 my $class = shift; 2644 my $class = shift;
2588 2645
2589 my $self = $class->SUPER::new (@_); 2646 my $self = $class->SUPER::new (
2647 scrolled => (new CFClient::UI::VBox),
2648 @_,
2649 );
2590 2650
2591 $self 2651 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601} 2652}
2602 2653
2603sub set_items { 2654sub set_items {
2604 my ($self, $items) = @_; 2655 my ($self, $items) = @_;
2656
2657 $self->{scrolled}->clear;
2658 return unless $items;
2659
2605 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2660 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2606 2661
2607 $self->{real_items} = \@items; 2662 $self->{real_items} = \@items;
2608 2663
2609 for my $item (@items) { 2664 for my $item (@items) {
2610 my $desc = $item->{nrof} < 2 2665 my $desc = $item->{nrof} < 2
2611 ? $item->{name} 2666 ? $item->{name}
2612 : "$item->{nrof} $item->{name_pl}"; 2667 : "$item->{nrof} $item->{name_pl}";
2613 2668
2614 $self->add (my $hb = new CFClient::UI::HBox); 2669 my $hb = new CFClient::UI::HBox;
2615 2670
2616 $hb->add (my $f = new CFClient::UI::Face 2671 $hb->add (my $f = new CFClient::UI::Face
2617 can_events => 0, 2672 can_events => 0,
2618 face => $item->{face}, 2673 face => $item->{face},
2619 anim => $item->{anim}, 2674 anim => $item->{anim},
2620 animspeed => $item->{animspeed}, 2675 animspeed => $item->{animspeed},
2621 expand => 1, 2676 expand => 1,
2622 ); 2677 );
2623 $hb->add (new CFClient::UI::Label text => $desc, expand => 1); 2678 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2679 $self->{scrolled}->add ($hb);
2624 } 2680 }
2625 2681
2626 $self->{max_pos} = (scalar @items) - 1;
2627
2628 my $range = $self->{range};
2629 my $page = $self->{h} / 32; # what information source to use for face size?
2630 # it should be configurable I guess...
2631 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2682# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2632 $range->update;
2633} 2683}
2634 2684
2635sub size_request { 2685sub size_request {
2636 my ($self) = @_; 2686 my ($self) = @_;
2637 (100, 200) 2687 (100, 200)
2638} 2688}
2639
2640sub set_range {
2641 my ($self, $range) = @_;
2642
2643 $self->{range} = $range;
2644 $range->connect (changed => sub { $self->update });
2645
2646 my $page = $self->{h} / 32; # waht information souce to use for face size?
2647 # it should be configurable i guess...
2648
2649 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2650 $range->update;
2651
2652 $self->update;
2653}
2654
2655sub _draw {
2656 my ($self) = @_;
2657
2658 my ($w, $h) = ($self->{w}, $self->{h});
2659
2660 $self->{pos} = int $self->{range}{range}[0];
2661
2662 my $y = 0;
2663 my $cnt = 0;
2664 my $hrem = $self->{h}; # horiz. remaining space
2665
2666 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2667 my $chld = $self->{children}->[$i];
2668
2669 if ($hrem >= $chld->{h}) {
2670 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2671
2672 $chld->draw;
2673
2674 $hrem -= $chld->{h};
2675 $y += $chld->{h};
2676 } else {
2677 last
2678 }
2679 }
2680}
2681
2682 2689
2683############################################################################# 2690#############################################################################
2684 2691
2685package CFClient::UI; 2692package CFClient::UI;
2686 2693

Diff Legend

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