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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.237 by root, Thu May 25 21:36:45 2006 UTC

… …
322} 322}
323 323
324sub set_tooltip { 324sub set_tooltip {
325 my ($self, $tooltip) = @_; 325 my ($self, $tooltip) = @_;
326 326
327 $tooltip =~ s/^\s+//;
328 $tooltip =~ s/\s+$//;
329
330 return if $self->{tooltip} eq $tooltip;
331
327 $self->{tooltip} = $tooltip; 332 $self->{tooltip} = $tooltip;
328 333
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 334 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner}; 335 delete $CFClient::UI::TOOLTIP->{owner};
331 CFClient::UI::check_tooltip; 336 CFClient::UI::check_tooltip;
… …
420 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
421 glPushMatrix; 426 glPushMatrix;
422 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
423 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
425 glVertex 0 , 0; 430 glVertex 0 , 0;
426 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
427 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
428 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
429 glEnd; 434 glEnd;
430 glPopMatrix; 435 glPopMatrix;
431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
432 } 437 }
433} 438}
… …
452 457
453sub set_parent { 458sub set_parent {
454 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
455 460
456 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
457 465
458 # TODO: req_w _does_change after ->reconfigure 466 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size 467 $self->check_size
460 unless exists $self->{req_w}; 468 unless exists $self->{req_w};
461 469
… …
613 delete $child->{parent}; 621 delete $child->{parent};
614 $child->hide; 622 $child->hide;
615 623
616 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617 625
618 $self->check_size; 626 $self->check_size (1);
619 $self->update; 627 $self->update;
620} 628}
621 629
622sub clear { 630sub clear {
623 my ($self) = @_; 631 my ($self) = @_;
… …
763 771
764package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
765 773
766our @ISA = CFClient::UI::Window::; 774our @ISA = CFClient::UI::Window::;
767 775
776sub new {
777 my $class = shift;
778
779 $class->SUPER::new (
780 scroll_x => 0,
781 scroll_y => 1,
782 @_,
783 )
784}
785
768sub size_request { 786sub size_request {
769 my ($self) = @_; 787 my ($self) = @_;
770 788
771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
772 790
… …
774} 792}
775 793
776sub size_allocate { 794sub size_allocate {
777 my ($self, $w, $h) = @_; 795 my ($self, $w, $h) = @_;
778 796
779 my ($cw, $ch) = @$self{qw(child_w child_h)}; 797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
780# $w = $self->{w}; 798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799
781 $self->child->configure (0, 0, $cw, $ch); 800 $self->child->configure (0, 0, $w, $h);
782 $self->update; 801 $self->update;
783} 802}
784 803
785sub set_offset { 804sub set_offset {
786 my ($self, $x, $y) = @_; 805 my ($self, $x, $y) = @_;
… …
1081sub new { 1100sub new {
1082 my $class = shift; 1101 my $class = shift;
1083 1102
1084 $class->SUPER::new ( 1103 $class->SUPER::new (
1085 col_expand => [], 1104 col_expand => [],
1086 @_ 1105 @_,
1087 ) 1106 )
1107}
1108
1109sub children {
1110 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1111}
1089 1112
1090sub add { 1113sub add {
1091 my ($self, $x, $y, $child) = @_; 1114 my ($self, $x, $y, $child) = @_;
1092 1115
1093 $child->set_parent ($self); 1116 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1117 $self->{children}[$y][$x] = $child;
1095 1118
1096 $child->check_size; 1119 $self->check_size (1);
1097} 1120}
1098 1121
1099sub children {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101}
1102
1103# TODO: move to container class maybe? send childs a signal on removal? 1122# TODO: move to container class maybe? send children a signal on removal?
1104sub clear { 1123sub clear {
1105 my ($self) = @_; 1124 my ($self) = @_;
1106 1125
1107 my @children = $self->children; 1126 my @children = $self->children;
1108 delete $self->{children}; 1127 delete $self->{children};
… …
1110 for (@children) { 1129 for (@children) {
1111 delete $_->{parent}; 1130 delete $_->{parent};
1112 $_->hide; 1131 $_->hide;
1113 } 1132 }
1114 1133
1134 $self->check_size (1);
1115 $self->update; 1135 $self->update;
1116} 1136}
1117 1137
1118sub get_wh { 1138sub get_wh {
1119 my ($self) = @_; 1139 my ($self) = @_;
… …
2623 2643
2624sub new { 2644sub new {
2625 my $class = shift; 2645 my $class = shift;
2626 2646
2627 my $self = $class->SUPER::new ( 2647 my $self = $class->SUPER::new (
2628 aspect => 1, 2648 aspect => 1,
2649 can_events => 0,
2629 @_, 2650 @_,
2630 ); 2651 );
2631 2652
2632 if ($self->{anim} && $self->{animspeed}) { 2653 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2654 Scalar::Util::weaken (my $widget = $self);
… …
2692 $self->SUPER::DESTROY; 2713 $self->SUPER::DESTROY;
2693} 2714}
2694 2715
2695############################################################################# 2716#############################################################################
2696 2717
2697package CFClient::UI::InventoryItem; 2718package CFClient::UI::Inventory;
2698 2719
2699our @ISA = CFClient::UI::HBox::; 2720our @ISA = CFClient::UI::ScrolledWindow::;
2700
2701sub _item_to_desc {
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2726 2721
2727sub new { 2722sub new {
2728 my $class = shift; 2723 my $class = shift;
2729 2724
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2736 my $self = $class->SUPER::new ( 2725 my $self = $class->SUPER::new (
2737 can_hover => 1,
2738 can_events => 1,
2739 tooltip => ((CFClient::UI::Label::escape $desc)
2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741 connect_button_down => sub {
2742 my ($self, $ev, $x, $y) = @_;
2743
2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2755 } elsif ($ev->{button} == 2) {
2756 $::CONN->send ("apply $item->{tag}");
2757 } elsif ($ev->{button} == 3) {
2758 my @menu_items = (
2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2771 ),
2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775 }
2776
2777 1
2778 },
2779 %args
2780 );
2781
2782
2783 $self->add (new CFClient::UI::Face
2784 can_events => 0,
2785 face => $item->{face},
2786 anim => $item->{anim},
2787 animspeed => $item->{animspeed},
2788 );
2789
2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2795
2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Inventory;
2810
2811our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 scrolled => (new CFClient::UI::Table), 2726 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2818 @_, 2727 @_,
2819 ); 2728 );
2820 2729
2821 $self 2730 $self
2822} 2731}
… …
2832 or ($a->{name} cmp $b->{name}) 2741 or ($a->{name} cmp $b->{name})
2833 } @$items; 2742 } @$items;
2834 2743
2835 $self->{real_items} = \@items; 2744 $self->{real_items} = \@items;
2836 2745
2746 my $row = 0;
2837 for my $item (@items) { 2747 for my $item (@items) {
2838 $item->{item} = $item; 2748 CFClient::Item::update_widgets $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842 2749
2843 my $i = 0; 2750 $self->{scrolled}->add (0, $row, $item->{face_widget});
2844 for (@items) { 2751 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2845 $self->{scrolled}->add (0, $i, $_); 2752 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2846 my $nrof = $_->{item}->{nrof} || 1; 2753
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000); 2754 $row++;
2848 } 2755 }
2849 2756
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2851} 2758}
2852 2759
… …
2992sub add { 2899sub add {
2993 my ($self, $text, %arg) = @_; 2900 my ($self, $text, %arg) = @_;
2994 2901
2995 $text =~ s/^\s+//; 2902 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//; 2903 $text =~ s/\s+$//;
2904
2905 return unless $text;
2997 2906
2998 my $timeout = time + ((delete $arg{timeout}) || 60); 2907 my $timeout = time + ((delete $arg{timeout}) || 60);
2999 2908
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001 2910

Diff Legend

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