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.239 by root, Thu May 25 22:29:57 2006 UTC

… …
233 delete $self->{visible}; 233 delete $self->{visible};
234 234
235 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237 237
238 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
238 $self->focus_out; 241 $self->focus_out;
239} 242}
240 243
241sub hide { 244sub hide {
242 my ($self) = @_; 245 my ($self) = @_;
… …
318 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
319} 322}
320 323
321sub set_tooltip { 324sub set_tooltip {
322 my ($self, $tooltip) = @_; 325 my ($self, $tooltip) = @_;
326
327 $tooltip =~ s/^\s+//;
328 $tooltip =~ s/\s+$//;
329
330 return if $self->{tooltip} eq $tooltip;
323 331
324 $self->{tooltip} = $tooltip; 332 $self->{tooltip} = $tooltip;
325 333
326 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 334 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner}; 335 delete $CFClient::UI::TOOLTIP->{owner};
… …
417 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
418 glPushMatrix; 426 glPushMatrix;
419 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
420 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
422 glVertex 0 , 0; 430 glVertex 0 , 0;
423 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
424 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
425 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
426 glEnd; 434 glEnd;
427 glPopMatrix; 435 glPopMatrix;
428 #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;
429 } 437 }
430} 438}
… …
449 457
450sub set_parent { 458sub set_parent {
451 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
452 460
453 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
454 465
455 # TODO: req_w _does_change after ->reconfigure 466 # TODO: req_w _does_change after ->reconfigure
456 $self->check_size 467 $self->check_size
457 unless exists $self->{req_w}; 468 unless exists $self->{req_w};
458 469
… …
610 delete $child->{parent}; 621 delete $child->{parent};
611 $child->hide; 622 $child->hide;
612 623
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 625
615 $self->check_size; 626 $self->check_size (1);
616 $self->update; 627 $self->update;
617} 628}
618 629
619sub clear { 630sub clear {
620 my ($self) = @_; 631 my ($self) = @_;
… …
760 771
761package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
762 773
763our @ISA = CFClient::UI::Window::; 774our @ISA = CFClient::UI::Window::;
764 775
776sub new {
777 my $class = shift;
778
779 $class->SUPER::new (
780 scroll_x => 0,
781 scroll_y => 1,
782 @_,
783 )
784}
785
765sub size_request { 786sub size_request {
766 my ($self) = @_; 787 my ($self) = @_;
767 788
768 @$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)};
769 790
… …
771} 792}
772 793
773sub size_allocate { 794sub size_allocate {
774 my ($self, $w, $h) = @_; 795 my ($self, $w, $h) = @_;
775 796
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
777# $w = $self->{w}; 798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799
778 $self->child->configure (0, 0, $cw, $ch); 800 $self->child->configure (0, 0, $w, $h);
779 $self->update; 801 $self->update;
780} 802}
781 803
782sub set_offset { 804sub set_offset {
783 my ($self, $x, $y) = @_; 805 my ($self, $x, $y) = @_;
… …
852 $self->{vp}->add ($self->{scrolled}); 874 $self->{vp}->add ($self->{scrolled});
853 $self->add ($self->{vp}); 875 $self->add ($self->{vp});
854 $self->add ($self->{slider}); 876 $self->add ($self->{slider});
855 877
856 $self 878 $self
879}
880
881sub update {
882 my ($self) = @_;
883
884 $self->SUPER::update;
885
886 # todo: overwrite size_allocate of child
887 my $child = $self->{vp}->child;
888 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
857} 889}
858 890
859sub size_allocate { 891sub size_allocate {
860 my ($self, $w, $h) = @_; 892 my ($self, $w, $h) = @_;
861 893
… …
1078sub new { 1110sub new {
1079 my $class = shift; 1111 my $class = shift;
1080 1112
1081 $class->SUPER::new ( 1113 $class->SUPER::new (
1082 col_expand => [], 1114 col_expand => [],
1083 @_ 1115 @_,
1084 ) 1116 )
1117}
1118
1119sub children {
1120 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1121}
1086 1122
1087sub add { 1123sub add {
1088 my ($self, $x, $y, $child) = @_; 1124 my ($self, $x, $y, $child) = @_;
1089 1125
1090 $child->set_parent ($self); 1126 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1127 $self->{children}[$y][$x] = $child;
1092 1128
1093 $child->check_size; 1129 $self->check_size (1);
1094} 1130}
1095 1131
1096sub children {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098}
1099
1100# TODO: move to container class maybe? send childs a signal on removal? 1132# TODO: move to container class maybe? send children a signal on removal?
1101sub clear { 1133sub clear {
1102 my ($self) = @_; 1134 my ($self) = @_;
1103 1135
1104 my @children = $self->children; 1136 my @children = $self->children;
1105 delete $self->{children}; 1137 delete $self->{children};
… …
1107 for (@children) { 1139 for (@children) {
1108 delete $_->{parent}; 1140 delete $_->{parent};
1109 $_->hide; 1141 $_->hide;
1110 } 1142 }
1111 1143
1144 $self->check_size (1);
1112 $self->update; 1145 $self->update;
1113} 1146}
1114 1147
1115sub get_wh { 1148sub get_wh {
1116 my ($self) = @_; 1149 my ($self) = @_;
… …
1148sub size_allocate { 1181sub size_allocate {
1149 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1150 1183
1151 my ($ws, $hs) = $self->get_wh; 1184 my ($ws, $hs) = $self->get_wh;
1152 1185
1153 my $req_w = sum @$ws; 1186 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1187 my $req_h = (sum @$hs) || 1;
1155 1188
1156 # TODO: nicer code && do row_expand 1189 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1190 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1191 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1192 my $col_expand = (sum @col_expand) || 1;
… …
1562 my ($self) = @_; 1595 my ($self) = @_;
1563 1596
1564 my ($w, $h) = $self->SUPER::size_request; 1597 my ($w, $h) = $self->SUPER::size_request;
1565 1598
1566 ($w + 1, $h) # add 1 for cursor 1599 ($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} 1600}
1574 1601
1575sub key_down { 1602sub key_down {
1576 my ($self, $ev) = @_; 1603 my ($self, $ev) = @_;
1577 1604
… …
2119} 2146}
2120 2147
2121sub set_range { 2148sub set_range {
2122 my ($self, $range) = @_; 2149 my ($self, $range) = @_;
2123 2150
2124 $self->{range} = $range; 2151 ($range, $self->{range}) = ($self->{range}, $range);
2125 2152
2126 $self->update; 2153 $self->update
2154 if "@$range" ne "@{$self->{range}}";
2127} 2155}
2128 2156
2129sub set_value { 2157sub set_value {
2130 my ($self, $value) = @_; 2158 my ($self, $value) = @_;
2131 2159
… …
2626 2654
2627sub new { 2655sub new {
2628 my $class = shift; 2656 my $class = shift;
2629 2657
2630 my $self = $class->SUPER::new ( 2658 my $self = $class->SUPER::new (
2631 aspect => 1, 2659 aspect => 1,
2660 can_events => 0,
2632 @_, 2661 @_,
2633 ); 2662 );
2634 2663
2635 if ($self->{anim} && $self->{animspeed}) { 2664 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2665 Scalar::Util::weaken (my $widget = $self);
… …
2695 $self->SUPER::DESTROY; 2724 $self->SUPER::DESTROY;
2696} 2725}
2697 2726
2698############################################################################# 2727#############################################################################
2699 2728
2700package CFClient::UI::InventoryItem; 2729package CFClient::UI::Inventory;
2701 2730
2702our @ISA = CFClient::UI::HBox::; 2731our @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 2732
2730sub new { 2733sub new {
2731 my $class = shift; 2734 my $class = shift;
2732 2735
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 ( 2736 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), 2737 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2821 @_, 2738 @_,
2822 ); 2739 );
2823 2740
2824 $self 2741 $self
2825} 2742}
… …
2835 or ($a->{name} cmp $b->{name}) 2752 or ($a->{name} cmp $b->{name})
2836 } @$items; 2753 } @$items;
2837 2754
2838 $self->{real_items} = \@items; 2755 $self->{real_items} = \@items;
2839 2756
2757 my $row = 0;
2840 for my $item (@items) { 2758 for my $item (@items) {
2841 $item->{item} = $item; 2759 CFClient::Item::update_widgets $item;
2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2844 }
2845 2760
2846 my $i = 0; 2761 $self->{scrolled}->add (0, $row, $item->{face_widget});
2847 for (@items) { 2762 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2848 $self->{scrolled}->add (0, $i, $_); 2763 $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 2764
2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2765 $row++;
2766 }
2854} 2767}
2855 2768
2856sub size_request { 2769sub size_request {
2857 my ($self) = @_; 2770 my ($self) = @_;
2858 ($self->{req_w}, $self->{req_h}); 2771 ($self->{req_w}, $self->{req_h});
… …
2995sub add { 2908sub add {
2996 my ($self, $text, %arg) = @_; 2909 my ($self, $text, %arg) = @_;
2997 2910
2998 $text =~ s/^\s+//; 2911 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 2912 $text =~ s/\s+$//;
2913
2914 return unless $text;
3000 2915
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 2916 my $timeout = time + ((delete $arg{timeout}) || 60);
3002 2917
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2918 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 2919

Diff Legend

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