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.180 by root, Fri Apr 28 18:06:12 2006 UTC vs.
Revision 1.185 by root, Mon May 8 17:23: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
744# hmm, this does not work for topleft of $self... but we should not aks for that
745sub _topleft {
746 my ($self, $x, $y) = @_;
747
748 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
749}
750
751sub find_widget {
752 my ($self, $x, $y) = @_;
753
754 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
755 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
756 ) {
757 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
758 } else {
759 $self->CFClient::UI::Base::find_widget ($x, $y)
760 }
761}
762
763sub _render {
764 my ($self) = @_;
765
766 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
767
768 $self->SUPER::_render;
769}
770
771#############################################################################
772
773package CFClient::UI::ScrolledWindow;
774
775our @ISA = CFClient::UI::HBox::;
776
777sub new {
778 my $class = shift;
779
780 my $self;
781
782 my $slider = new CFClient::UI::Slider
783 vertical => 1,
784 range => [0, 0, 1, 0.01], # HACK fix
785 connect_changed => sub {
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
787 },
788 ;
789
790 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort),
792 slider => $slider,
793 @_,
794 );
795
796 $self->{vp}->add ($self->{scrolled});
797 $self->add ($self->{vp});
798 $self->add ($self->{slider});
799
800 $self
801}
802
803#TODO# update range on size_allocate depeneing on child
804# update viewport offset on scroll
727 805
728############################################################################# 806#############################################################################
729 807
730package CFClient::UI::Frame; 808package CFClient::UI::Frame;
731 809
… …
1957 # TODO: calculations are off 2035 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2036 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2037 fg => [1, 1, 1],
1960 active_fg => [0, 0, 0], 2038 active_fg => [0, 0, 0],
1961 range => [0, 0, 100, 10], 2039 range => [0, 0, 100, 10],
1962 req_w => 20, 2040 req_w => $::WIDTH / 80,
1963 req_h => 20, 2041 req_h => $::WIDTH / 80,
1964 vertical => 0, 2042 vertical => 0,
1965 can_hover => 1, 2043 can_hover => 1,
1966 inner_pad => 5, 2044 inner_pad => 5,
1967 @_ 2045 @_
1968 ); 2046 );
… …
2405} 2483}
2406 2484
2407sub _draw { 2485sub _draw {
2408 my ($self) = @_; 2486 my ($self) = @_;
2409 2487
2488 return unless $::CONN;#d# manage and cache textures differently
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2411 2490
2412 # TODO animation 2491 # TODO animation
2413 if ($tex) { 2492 if ($tex) {
2414 glEnable GL_BLEND; 2493 glEnable GL_BLEND;
… …
2475} 2554}
2476 2555
2477sub mouse_motion { 2556sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2557 my ($self, $ev, $x, $y) = @_;
2479 2558
2480 # TODO: should use vbox->fdind_widget or so 2559 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2560 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2561 $self->{hover} = $self->{item}{$HOVER};
2483} 2562}
2484 2563
2485sub button_up { 2564sub button_up {
… …
2575 $self->_draw; 2654 $self->_draw;
2576} 2655}
2577 2656
2578############################################################################# 2657#############################################################################
2579 2658
2580package CFClient::UI::Inventory; 2659package CFClient::UI::InventoryItem;
2581 2660
2582our @ISA = CFClient::UI::Container::; 2661our @ISA = CFClient::UI::HBox::;
2583
2584use CFClient::OpenGL;
2585 2662
2586sub new { 2663sub new {
2587 my $class = shift; 2664 my $class = shift;
2588 2665
2666 my %args = @_;
2667
2668 my $item = $args{item};
2669
2670 my $desc = $item->{nrof} < 2
2671 ? $item->{name}
2672 : "$item->{nrof} $item->{name_pl}";
2673
2674
2589 my $self = $class->SUPER::new (@_); 2675 my $self = $class->SUPER::new (
2676 can_hover => 1,
2677 can_events => 1,
2678 tooltip => (CFClient::UI::Label->escape ($desc)
2679 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2680 connect_button_down => sub {
2681 my ($self, $ev, $x, $y) = @_;
2682
2683 # todo: maybe put examine on 1? but should just be a tooltip :(
2684 if ($ev->{button} == 1) {
2685 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2686 } elsif ($ev->{button} == 2) {
2687 $::CONN->send ("apply $item->{tag}");
2688 } elsif ($ev->{button} == 3) {
2689 CFClient::UI::Menu->new (
2690 items => [
2691 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2692 [
2693 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2694 sub { $::CONN->send ("lock $item->{tag}") },
2695 ],
2696 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2697 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2698 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2699 ],
2700 )->popup ($ev);
2701 }
2702
2703 1
2704 },
2705 %args
2706 );
2707 $self->add(new CFClient::UI::Face
2708 can_events => 0,
2709 face => $item->{face},
2710 anim => $item->{anim},
2711 animspeed => $item->{animspeed});
2712 $self->add(new CFClient::UI::Label
2713 can_events => 0,
2714 text => $desc);
2590 2715
2591 $self 2716 $self
2592} 2717}
2593 2718
2594sub size_allocate { 2719#############################################################################
2595 my ($self, $w, $h) = @_;
2596 2720
2597 $self->{w} = $w; 2721package CFClient::UI::Inventory;
2598 $self->{h} = $h;
2599 2722
2600 $self->check_size; 2723our @ISA = CFClient::UI::ScrolledWindow::;
2724
2725sub new {
2726 my $class = shift;
2727
2728 my $self = $class->SUPER::new (
2729 scrolled => (new CFClient::UI::VBox),
2730 @_,
2731 );
2732
2733 $self
2601} 2734}
2602 2735
2603sub set_items { 2736sub set_items {
2604 my ($self, $items) = @_; 2737 my ($self, $items) = @_;
2605 my @items = values %{$items}; 2738
2739 $self->{scrolled}->clear;
2740 return unless $items;
2741
2606 @items = sort { $a->{type} <=> $b->{type} } @items; 2742 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2607 2743
2608 $self->{real_items} = \@items; 2744 $self->{real_items} = \@items;
2609 2745
2610 for my $item (@items) { 2746 for my $item (@items) {
2611 my $desc = $item->{nrof} < 2 2747 my $desc = $item->{nrof} < 2
2612 ? $item->{name} 2748 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}"; 2749 : "$item->{nrof} $item->{name_pl}";
2614 2750
2615 $self->add (my $hb = new CFClient::UI::HBox); 2751 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2616
2617 $hb->add (my $f = new CFClient::UI::Face
2618 can_events => 0,
2619 face => $item->{face},
2620 anim => $item->{anim},
2621 animspeed => $item->{animspeed},
2622 expand => 1,
2623 );
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625 } 2752 }
2626 2753
2627 $self->{max_pos} = (scalar @items) - 1;
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # what information source to use for face size?
2631 # it should be configurable I guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634} 2755}
2635 2756
2636sub size_request { 2757sub size_request {
2637 my ($self) = @_; 2758 my ($self) = @_;
2638 (100, 200) 2759 ($self->{req_w}, $self->{req_h});
2639} 2760}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->draw;
2674
2675 $hrem -= $chld->{h};
2676 $y += $chld->{h};
2677 } else {
2678 last
2679 }
2680 }
2681}
2682
2683 2761
2684############################################################################# 2762#############################################################################
2685 2763
2686package CFClient::UI; 2764package CFClient::UI;
2687 2765

Diff Legend

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