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.241 by root, Fri May 26 20:50:35 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
13our $ROOT; 14our $ROOT;
14our $TOOLTIP; 15our $TOOLTIP;
… …
228sub set_invisible { 229sub set_invisible {
229 my ($self) = @_; 230 my ($self) = @_;
230 231
231 # broken show/hide model 232 # broken show/hide model
232 233
234 delete $self->{root};
233 delete $self->{visible}; 235 delete $self->{visible};
234 236
235 undef $GRAB if $GRAB == $self; 237 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 238 undef $HOVER if $HOVER == $self;
237 239
… …
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 323 delete $self->{max_h}; $self->{max_h} = $h if $h;
322} 324}
323 325
324sub set_tooltip { 326sub set_tooltip {
325 my ($self, $tooltip) = @_; 327 my ($self, $tooltip) = @_;
328
329 $tooltip =~ s/^\s+//;
330 $tooltip =~ s/\s+$//;
331
332 return if $self->{tooltip} eq $tooltip;
326 333
327 $self->{tooltip} = $tooltip; 334 $self->{tooltip} = $tooltip;
328 335
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 336 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner}; 337 delete $CFClient::UI::TOOLTIP->{owner};
… …
420 if ($ENV{PCLIENT_DEBUG}) { 427 if ($ENV{PCLIENT_DEBUG}) {
421 glPushMatrix; 428 glPushMatrix;
422 glColor 1, 1, 0, 1; 429 glColor 1, 1, 0, 1;
423 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424 glBegin GL_LINE_LOOP; 431 glBegin GL_LINE_LOOP;
425 glVertex 0 , 0; 432 glVertex 0 , 0;
426 glVertex $self->{w}, 0; 433 glVertex $self->{w} - 1, 0;
427 glVertex $self->{w}, $self->{h}; 434 glVertex $self->{w} - 1, $self->{h} - 1;
428 glVertex 0 , $self->{h}; 435 glVertex 0 , $self->{h} - 1;
429 glEnd; 436 glEnd;
430 glPopMatrix; 437 glPopMatrix;
431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 438 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
432 } 439 }
433} 440}
… …
452 459
453sub set_parent { 460sub set_parent {
454 my ($self, $parent) = @_; 461 my ($self, $parent) = @_;
455 462
456 Scalar::Util::weaken ($self->{parent} = $parent); 463 Scalar::Util::weaken ($self->{parent} = $parent);
464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
457 467
458 # TODO: req_w _does_change after ->reconfigure 468 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size 469 $self->check_size
460 unless exists $self->{req_w}; 470 unless exists $self->{req_w};
461 471
… …
613 delete $child->{parent}; 623 delete $child->{parent};
614 $child->hide; 624 $child->hide;
615 625
616 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617 627
618 $self->check_size; 628 $self->check_size (1);
619 $self->update; 629 $self->update;
620} 630}
621 631
622sub clear { 632sub clear {
623 my ($self) = @_; 633 my ($self) = @_;
… …
763 773
764package CFClient::UI::ViewPort; 774package CFClient::UI::ViewPort;
765 775
766our @ISA = CFClient::UI::Window::; 776our @ISA = CFClient::UI::Window::;
767 777
778sub new {
779 my $class = shift;
780
781 $class->SUPER::new (
782 scroll_x => 0,
783 scroll_y => 1,
784 @_,
785 )
786}
787
768sub size_request { 788sub size_request {
769 my ($self) = @_; 789 my ($self) = @_;
770 790
771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
772 792
… …
774} 794}
775 795
776sub size_allocate { 796sub size_allocate {
777 my ($self, $w, $h) = @_; 797 my ($self, $w, $h) = @_;
778 798
779 my ($cw, $ch) = @$self{qw(child_w child_h)}; 799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
780# $w = $self->{w}; 800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
801
781 $self->child->configure (0, 0, $cw, $ch); 802 $self->child->configure (0, 0, $w, $h);
782 $self->update; 803 $self->update;
783} 804}
784 805
785sub set_offset { 806sub set_offset {
786 my ($self, $x, $y) = @_; 807 my ($self, $x, $y) = @_;
… …
855 $self->{vp}->add ($self->{scrolled}); 876 $self->{vp}->add ($self->{scrolled});
856 $self->add ($self->{vp}); 877 $self->add ($self->{vp});
857 $self->add ($self->{slider}); 878 $self->add ($self->{slider});
858 879
859 $self 880 $self
881}
882
883sub update {
884 my ($self) = @_;
885
886 $self->SUPER::update;
887
888 # todo: overwrite size_allocate of child
889 my $child = $self->{vp}->child;
890 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
860} 891}
861 892
862sub size_allocate { 893sub size_allocate {
863 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
864 895
… …
1081sub new { 1112sub new {
1082 my $class = shift; 1113 my $class = shift;
1083 1114
1084 $class->SUPER::new ( 1115 $class->SUPER::new (
1085 col_expand => [], 1116 col_expand => [],
1086 @_ 1117 @_,
1087 ) 1118 )
1119}
1120
1121sub children {
1122 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1123}
1089 1124
1090sub add { 1125sub add {
1091 my ($self, $x, $y, $child) = @_; 1126 my ($self, $x, $y, $child) = @_;
1092 1127
1093 $child->set_parent ($self); 1128 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1129 $self->{children}[$y][$x] = $child;
1095 1130
1096 $child->check_size; 1131 $self->check_size (1);
1097} 1132}
1098 1133
1099sub children {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101}
1102
1103# TODO: move to container class maybe? send childs a signal on removal? 1134# TODO: move to container class maybe? send children a signal on removal?
1104sub clear { 1135sub clear {
1105 my ($self) = @_; 1136 my ($self) = @_;
1106 1137
1107 my @children = $self->children; 1138 my @children = $self->children;
1108 delete $self->{children}; 1139 delete $self->{children};
… …
1110 for (@children) { 1141 for (@children) {
1111 delete $_->{parent}; 1142 delete $_->{parent};
1112 $_->hide; 1143 $_->hide;
1113 } 1144 }
1114 1145
1146 $self->check_size (1);
1115 $self->update; 1147 $self->update;
1116} 1148}
1117 1149
1118sub get_wh { 1150sub get_wh {
1119 my ($self) = @_; 1151 my ($self) = @_;
… …
1151sub size_allocate { 1183sub size_allocate {
1152 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1153 1185
1154 my ($ws, $hs) = $self->get_wh; 1186 my ($ws, $hs) = $self->get_wh;
1155 1187
1156 my $req_w = sum @$ws; 1188 my $req_w = (sum @$ws) || 1;
1157 my $req_h = sum @$hs; 1189 my $req_h = (sum @$hs) || 1;
1158 1190
1159 # TODO: nicer code && do row_expand 1191 # TODO: nicer code && do row_expand
1160 my @col_expand = @{$self->{col_expand}}; 1192 my @col_expand = @{$self->{col_expand}};
1161 @col_expand = (1) x @$ws unless @col_expand; 1193 @col_expand = (1) x @$ws unless @col_expand;
1162 my $col_expand = (sum @col_expand) || 1; 1194 my $col_expand = (sum @col_expand) || 1;
… …
2116} 2148}
2117 2149
2118sub set_range { 2150sub set_range {
2119 my ($self, $range) = @_; 2151 my ($self, $range) = @_;
2120 2152
2121 $self->{range} = $range; 2153 ($range, $self->{range}) = ($self->{range}, $range);
2122 2154
2123 $self->update; 2155 $self->update
2156 if "@$range" ne "@{$self->{range}}";
2124} 2157}
2125 2158
2126sub set_value { 2159sub set_value {
2127 my ($self, $value) = @_; 2160 my ($self, $value) = @_;
2128 2161
… …
2623 2656
2624sub new { 2657sub new {
2625 my $class = shift; 2658 my $class = shift;
2626 2659
2627 my $self = $class->SUPER::new ( 2660 my $self = $class->SUPER::new (
2628 aspect => 1, 2661 aspect => 1,
2662 can_events => 0,
2629 @_, 2663 @_,
2630 ); 2664 );
2631 2665
2632 if ($self->{anim} && $self->{animspeed}) { 2666 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2667 Scalar::Util::weaken (my $widget = $self);
… …
2692 $self->SUPER::DESTROY; 2726 $self->SUPER::DESTROY;
2693} 2727}
2694 2728
2695############################################################################# 2729#############################################################################
2696 2730
2697package CFClient::UI::InventoryItem; 2731package CFClient::UI::Inventory;
2698 2732
2699our @ISA = CFClient::UI::HBox::; 2733our @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 2734
2727sub new { 2735sub new {
2728 my $class = shift; 2736 my $class = shift;
2729 2737
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 ( 2738 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), 2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2818 @_, 2740 @_,
2819 ); 2741 );
2820 2742
2821 $self 2743 $self
2822} 2744}
… …
2832 or ($a->{name} cmp $b->{name}) 2754 or ($a->{name} cmp $b->{name})
2833 } @$items; 2755 } @$items;
2834 2756
2835 $self->{real_items} = \@items; 2757 $self->{real_items} = \@items;
2836 2758
2759 my $row = 0;
2837 for my $item (@items) { 2760 for my $item (@items) {
2838 $item->{item} = $item; 2761 CFClient::Item::update_widgets $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842 2762
2843 my $i = 0; 2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2844 for (@items) { 2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2845 $self->{scrolled}->add (0, $i, $_); 2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2849 2766
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2767 $row++;
2768 }
2851} 2769}
2852 2770
2853sub size_request { 2771sub size_request {
2854 my ($self) = @_; 2772 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h}); 2773 ($self->{req_w}, $self->{req_h});
… …
2992sub add { 2910sub add {
2993 my ($self, $text, %arg) = @_; 2911 my ($self, $text, %arg) = @_;
2994 2912
2995 $text =~ s/^\s+//; 2913 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//; 2914 $text =~ s/\s+$//;
2915
2916 return unless $text;
2997 2917
2998 my $timeout = time + ((delete $arg{timeout}) || 60); 2918 my $timeout = time + ((delete $arg{timeout}) || 60);
2999 2919
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001 2921
… …
3045 2965
3046sub new { 2966sub new {
3047 my $class = shift; 2967 my $class = shift;
3048 2968
3049 $class->SUPER::new ( 2969 $class->SUPER::new (
2970 visible => 1,
3050 @_, 2971 @_,
3051 ) 2972 )
3052} 2973}
3053 2974
3054sub configure { 2975sub configure {
… …
3112sub add { 3033sub add {
3113 my ($self, @children) = @_; 3034 my ($self, @children) = @_;
3114 3035
3115 for (my @widgets = @children; my $w = pop @widgets; ) { 3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children; 3037 push @widgets, $w->children;
3117 $w->{root} = $self; 3038 $w->{root} = $self;
3118 $w->{visible} = 1; 3039 $w->{visible} = $self->{visible} + 1;
3119 } 3040 }
3120 3041
3121 for my $child (@children) { 3042 for my $child (@children) {
3122 $child->{is_toplevel} = 1; 3043 $child->{is_toplevel} = 1;
3123 3044

Diff Legend

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