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.231 by root, Thu May 25 00:26:19 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;
239
240 CFClient::UI::check_tooltip
241 if $CFClient::UI::TOOLTIP->{owner} == $self;
237 242
238 $self->focus_out; 243 $self->focus_out;
239} 244}
240 245
241sub hide { 246sub hide {
… …
318 delete $self->{max_h}; $self->{max_h} = $h if $h; 323 delete $self->{max_h}; $self->{max_h} = $h if $h;
319} 324}
320 325
321sub set_tooltip { 326sub set_tooltip {
322 my ($self, $tooltip) = @_; 327 my ($self, $tooltip) = @_;
328
329 $tooltip =~ s/^\s+//;
330 $tooltip =~ s/\s+$//;
331
332 return if $self->{tooltip} eq $tooltip;
323 333
324 $self->{tooltip} = $tooltip; 334 $self->{tooltip} = $tooltip;
325 335
326 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 336 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner}; 337 delete $CFClient::UI::TOOLTIP->{owner};
… …
417 if ($ENV{PCLIENT_DEBUG}) { 427 if ($ENV{PCLIENT_DEBUG}) {
418 glPushMatrix; 428 glPushMatrix;
419 glColor 1, 1, 0, 1; 429 glColor 1, 1, 0, 1;
420 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421 glBegin GL_LINE_LOOP; 431 glBegin GL_LINE_LOOP;
422 glVertex 0 , 0; 432 glVertex 0 , 0;
423 glVertex $self->{w}, 0; 433 glVertex $self->{w} - 1, 0;
424 glVertex $self->{w}, $self->{h}; 434 glVertex $self->{w} - 1, $self->{h} - 1;
425 glVertex 0 , $self->{h}; 435 glVertex 0 , $self->{h} - 1;
426 glEnd; 436 glEnd;
427 glPopMatrix; 437 glPopMatrix;
428 #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;
429 } 439 }
430} 440}
… …
449 459
450sub set_parent { 460sub set_parent {
451 my ($self, $parent) = @_; 461 my ($self, $parent) = @_;
452 462
453 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;
454 467
455 # TODO: req_w _does_change after ->reconfigure 468 # TODO: req_w _does_change after ->reconfigure
456 $self->check_size 469 $self->check_size
457 unless exists $self->{req_w}; 470 unless exists $self->{req_w};
458 471
… …
610 delete $child->{parent}; 623 delete $child->{parent};
611 $child->hide; 624 $child->hide;
612 625
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 627
615 $self->check_size; 628 $self->check_size (1);
616 $self->update; 629 $self->update;
617} 630}
618 631
619sub clear { 632sub clear {
620 my ($self) = @_; 633 my ($self) = @_;
… …
760 773
761package CFClient::UI::ViewPort; 774package CFClient::UI::ViewPort;
762 775
763our @ISA = CFClient::UI::Window::; 776our @ISA = CFClient::UI::Window::;
764 777
778sub new {
779 my $class = shift;
780
781 $class->SUPER::new (
782 scroll_x => 0,
783 scroll_y => 1,
784 @_,
785 )
786}
787
765sub size_request { 788sub size_request {
766 my ($self) = @_; 789 my ($self) = @_;
767 790
768 @$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)};
769 792
… …
771} 794}
772 795
773sub size_allocate { 796sub size_allocate {
774 my ($self, $w, $h) = @_; 797 my ($self, $w, $h) = @_;
775 798
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
777# $w = $self->{w}; 800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
801
778 $self->child->configure (0, 0, $cw, $ch); 802 $self->child->configure (0, 0, $w, $h);
779 $self->update; 803 $self->update;
780} 804}
781 805
782sub set_offset { 806sub set_offset {
783 my ($self, $x, $y) = @_; 807 my ($self, $x, $y) = @_;
… …
852 $self->{vp}->add ($self->{scrolled}); 876 $self->{vp}->add ($self->{scrolled});
853 $self->add ($self->{vp}); 877 $self->add ($self->{vp});
854 $self->add ($self->{slider}); 878 $self->add ($self->{slider});
855 879
856 $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]);
857} 891}
858 892
859sub size_allocate { 893sub size_allocate {
860 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
861 895
… …
1078sub new { 1112sub new {
1079 my $class = shift; 1113 my $class = shift;
1080 1114
1081 $class->SUPER::new ( 1115 $class->SUPER::new (
1082 col_expand => [], 1116 col_expand => [],
1083 @_ 1117 @_,
1084 ) 1118 )
1119}
1120
1121sub children {
1122 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1123}
1086 1124
1087sub add { 1125sub add {
1088 my ($self, $x, $y, $child) = @_; 1126 my ($self, $x, $y, $child) = @_;
1089 1127
1090 $child->set_parent ($self); 1128 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1129 $self->{children}[$y][$x] = $child;
1092 1130
1093 $child->check_size; 1131 $self->check_size (1);
1094} 1132}
1095 1133
1096sub children {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098}
1099
1100# 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?
1101sub clear { 1135sub clear {
1102 my ($self) = @_; 1136 my ($self) = @_;
1103 1137
1104 my @children = $self->children; 1138 my @children = $self->children;
1105 delete $self->{children}; 1139 delete $self->{children};
… …
1107 for (@children) { 1141 for (@children) {
1108 delete $_->{parent}; 1142 delete $_->{parent};
1109 $_->hide; 1143 $_->hide;
1110 } 1144 }
1111 1145
1146 $self->check_size (1);
1112 $self->update; 1147 $self->update;
1113} 1148}
1114 1149
1115sub get_wh { 1150sub get_wh {
1116 my ($self) = @_; 1151 my ($self) = @_;
… …
1148sub size_allocate { 1183sub size_allocate {
1149 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1150 1185
1151 my ($ws, $hs) = $self->get_wh; 1186 my ($ws, $hs) = $self->get_wh;
1152 1187
1153 my $req_w = sum @$ws; 1188 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1189 my $req_h = (sum @$hs) || 1;
1155 1190
1156 # TODO: nicer code && do row_expand 1191 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1192 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1193 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1194 my $col_expand = (sum @col_expand) || 1;
… …
1562 my ($self) = @_; 1597 my ($self) = @_;
1563 1598
1564 my ($w, $h) = $self->SUPER::size_request; 1599 my ($w, $h) = $self->SUPER::size_request;
1565 1600
1566 ($w + 1, $h) # add 1 for cursor 1601 ($w + 1, $h) # add 1 for cursor
1567}
1568
1569sub size_allocate {
1570 my ($self, $w, $h) = @_;
1571
1572 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1573} 1602}
1574 1603
1575sub key_down { 1604sub key_down {
1576 my ($self, $ev) = @_; 1605 my ($self, $ev) = @_;
1577 1606
… …
2119} 2148}
2120 2149
2121sub set_range { 2150sub set_range {
2122 my ($self, $range) = @_; 2151 my ($self, $range) = @_;
2123 2152
2124 $self->{range} = $range; 2153 ($range, $self->{range}) = ($self->{range}, $range);
2125 2154
2126 $self->update; 2155 $self->update
2156 if "@$range" ne "@{$self->{range}}";
2127} 2157}
2128 2158
2129sub set_value { 2159sub set_value {
2130 my ($self, $value) = @_; 2160 my ($self, $value) = @_;
2131 2161
… …
2626 2656
2627sub new { 2657sub new {
2628 my $class = shift; 2658 my $class = shift;
2629 2659
2630 my $self = $class->SUPER::new ( 2660 my $self = $class->SUPER::new (
2631 aspect => 1, 2661 aspect => 1,
2662 can_events => 0,
2632 @_, 2663 @_,
2633 ); 2664 );
2634 2665
2635 if ($self->{anim} && $self->{animspeed}) { 2666 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2667 Scalar::Util::weaken (my $widget = $self);
… …
2695 $self->SUPER::DESTROY; 2726 $self->SUPER::DESTROY;
2696} 2727}
2697 2728
2698############################################################################# 2729#############################################################################
2699 2730
2700package CFClient::UI::InventoryItem; 2731package CFClient::UI::Inventory;
2701 2732
2702our @ISA = CFClient::UI::HBox::; 2733our @ISA = CFClient::UI::ScrolledWindow::;
2703
2704sub _item_to_desc {
2705 my ($item) = @_;
2706
2707 my $desc =
2708 $item->{nrof} < 2
2709 ? $item->{name}
2710 : "$item->{nrof} × $item->{name_pl}";
2711
2712 $item->{flags} & Crossfire::Protocol::F_OPEN
2713 and $desc .= " (open)";
2714 $item->{flags} & Crossfire::Protocol::F_APPLIED
2715 and $desc .= " (applied)";
2716 $item->{flags} & Crossfire::Protocol::F_UNPAID
2717 and $desc .= " (unpaid)";
2718 $item->{flags} & Crossfire::Protocol::F_MAGIC
2719 and $desc .= " (magic)";
2720 $item->{flags} & Crossfire::Protocol::F_CURSED
2721 and $desc .= " (cursed)";
2722 $item->{flags} & Crossfire::Protocol::F_DAMNED
2723 and $desc .= " (damned)";
2724 $item->{flags} & Crossfire::Protocol::F_LOCKED
2725 and $desc .= " *";
2726
2727 $desc
2728}
2729 2734
2730sub new { 2735sub new {
2731 my $class = shift; 2736 my $class = shift;
2732 2737
2733 my %args = @_;
2734
2735 my $item = delete $args{item};
2736
2737 my $desc = _item_to_desc ($item);
2738
2739 my $self = $class->SUPER::new ( 2738 my $self = $class->SUPER::new (
2740 can_hover => 1,
2741 can_events => 1,
2742 tooltip => ((CFClient::UI::Label::escape $desc)
2743 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2744 connect_button_down => sub {
2745 my ($self, $ev, $x, $y) = @_;
2746
2747 # todo: maybe put examine on 1? but should just be a tooltip :(
2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749 my $targ = $::CONN->{player}{tag};
2750
2751 if ($item->{container} == $::CONN->{player}{tag}) {
2752 $targ = $main::OPENCONT;
2753 }
2754
2755 $::CONN->send ("move $targ $item->{tag} 0");
2756 } elsif ($ev->{button} == 1) {
2757 $::CONN->send ("examine $item->{tag}");
2758 } elsif ($ev->{button} == 2) {
2759 $::CONN->send ("apply $item->{tag}");
2760 } elsif ($ev->{button} == 3) {
2761 my @menu_items = (
2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2763 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2764 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765 (
2766 $item->{flags} & Crossfire::Protocol::F_LOCKED
2767 ? (
2768 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769 )
2770 : (
2771 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2772 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773 )
2774 ),
2775 );
2776
2777 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2778 }
2779
2780 1
2781 },
2782 %args
2783 );
2784
2785
2786 $self->add (new CFClient::UI::Face
2787 can_events => 0,
2788 face => $item->{face},
2789 anim => $item->{anim},
2790 animspeed => $item->{animspeed},
2791 );
2792
2793 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2794
2795 $self->{item} = $item;
2796
2797 $self->update_item;
2798
2799 $self
2800}
2801
2802sub update_item {
2803 my ($self) = @_;
2804
2805 my $desc = _item_to_desc ($self->{item});
2806
2807 $self->{name_lbl}->set_text ($desc);
2808}
2809
2810#############################################################################
2811
2812package CFClient::UI::Inventory;
2813
2814our @ISA = CFClient::UI::ScrolledWindow::;
2815
2816sub new {
2817 my $class = shift;
2818
2819 my $self = $class->SUPER::new (
2820 scrolled => (new CFClient::UI::Table), 2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2821 @_, 2740 @_,
2822 ); 2741 );
2823 2742
2824 $self 2743 $self
2825} 2744}
… …
2835 or ($a->{name} cmp $b->{name}) 2754 or ($a->{name} cmp $b->{name})
2836 } @$items; 2755 } @$items;
2837 2756
2838 $self->{real_items} = \@items; 2757 $self->{real_items} = \@items;
2839 2758
2759 my $row = 0;
2840 for my $item (@items) { 2760 for my $item (@items) {
2841 $item->{item} = $item; 2761 CFClient::Item::update_widgets $item;
2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2844 }
2845 2762
2846 my $i = 0; 2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2847 for (@items) { 2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2848 $self->{scrolled}->add (0, $i, $_); 2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2849 my $nrof = $_->{item}->{nrof} || 1;
2850 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851 }
2852 2766
2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2767 $row++;
2768 }
2854} 2769}
2855 2770
2856sub size_request { 2771sub size_request {
2857 my ($self) = @_; 2772 my ($self) = @_;
2858 ($self->{req_w}, $self->{req_h}); 2773 ($self->{req_w}, $self->{req_h});
… …
2995sub add { 2910sub add {
2996 my ($self, $text, %arg) = @_; 2911 my ($self, $text, %arg) = @_;
2997 2912
2998 $text =~ s/^\s+//; 2913 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 2914 $text =~ s/\s+$//;
2915
2916 return unless $text;
3000 2917
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 2918 my $timeout = time + ((delete $arg{timeout}) || 60);
3002 2919
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 2921
… …
3048 2965
3049sub new { 2966sub new {
3050 my $class = shift; 2967 my $class = shift;
3051 2968
3052 $class->SUPER::new ( 2969 $class->SUPER::new (
2970 visible => 1,
3053 @_, 2971 @_,
3054 ) 2972 )
3055} 2973}
3056 2974
3057sub configure { 2975sub configure {
… …
3115sub add { 3033sub add {
3116 my ($self, @children) = @_; 3034 my ($self, @children) = @_;
3117 3035
3118 for (my @widgets = @children; my $w = pop @widgets; ) { 3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3119 push @widgets, $w->children; 3037 push @widgets, $w->children;
3120 $w->{root} = $self; 3038 $w->{root} = $self;
3121 $w->{visible} = 1; 3039 $w->{visible} = $self->{visible} + 1;
3122 } 3040 }
3123 3041
3124 for my $child (@children) { 3042 for my $child (@children) {
3125 $child->{is_toplevel} = 1; 3043 $child->{is_toplevel} = 1;
3126 3044

Diff Legend

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