ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.41 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.47 by root, Wed Jun 28 21:43:15 2006 UTC

… …
105 push @{$self->{record}}, $command; 105 push @{$self->{record}}, $command;
106 } 106 }
107 107
108 $self->logprint ("send: ", $command); 108 $self->logprint ("send: ", $command);
109 $self->send_command ($command); 109 $self->send_command ($command);
110 ::status $command; 110 ::status ($command);
111} 111}
112 112
113sub start_record { 113sub start_record {
114 my ($self) = @_; 114 my ($self) = @_;
115 115
… …
523 return unless $::CONN; 523 return unless $::CONN;
524 524
525 $::FLOORBOX->clear; 525 $::FLOORBOX->clear;
526 526
527 my $row; 527 my $row;
528 for (@{ $::CONN->{container}{0} }) { 528 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
529 if ($row < 6) { 529 if ($row < 6) {
530 local $_->{face_widget}; # hack to force recreation of widget 530 local $_->{face_widget}; # hack to force recreation of widget
531 local $_->{desc_widget}; # hack to force recreation of widget 531 local $_->{desc_widget}; # hack to force recreation of widget
532 CFClient::Item::update_widgets $_; 532 CFClient::Item::update_widgets $_;
533 533
… …
579} 579}
580 580
581sub container_add { 581sub container_add {
582 my ($self, $tag, $items) = @_; 582 my ($self, $tag, $items) = @_;
583 583
584 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 584 $self->{update_container}{$tag}++;
585 $self->update_containers;
586}
585 587
588sub update_containers {
589 my ($self) = @_;
590
591 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
592 for my $tag (keys %{ delete $self->{update_container} }) {
586 if ($tag == 0) { 593 if ($tag == 0) {
587 update_floorbox; 594 update_floorbox;
588 update_container (0); 595 update_container (0);
589 } elsif ($tag == $self->{player}{tag}) { 596 } elsif ($tag == $self->{player}{tag}) {
590 $::INV->set_items ($self->{container}{$self->{player}{tag}}) 597 $::INV->set_items ($self->{container}{$tag})
591 } else { 598 } else {
592 update_container ($tag); 599 update_container ($tag);
600 }
601 }
593 } 602 });
594
595 # $self-<{player}{tag} => player inv
596 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
597} 603}
598 604
599sub container_clear { 605sub container_clear {
600 my ($self, $tag) = @_; 606 my ($self, $tag) = @_;
601 607
602 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 608 $self->{update_container}{$tag}++;
603 609 $self->update_containers;
604 if ($tag == 0) {
605 update_floorbox;
606 update_container (0);
607 } elsif ($tag == $self->{player}{tag}) {
608 $::INV->set_items ($self->{container}{$tag})
609 } else {
610 update_container ($tag);
611 }
612
613# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
614} 610}
615 611
616sub item_delete { 612sub item_delete {
617 my ($self, @items) = @_; 613 my ($self, @items) = @_;
618 614
615 $self->{update_container}{$_->{tag}}++
619 for (@items) { 616 for @items;
620 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
621
622 if ($_->{container} == 0) {
623 update_floorbox;
624 update_container ($_->{tag});
625 } elsif ($_->{container} == $self->{player}{tag}) {
626 $::INV->set_items ($self->{container}{$self->{player}{tag}})
627 } else {
628 update_container ($_->{container});
629 }
630 } 617
618 $self->update_containers;
631} 619}
632 620
633sub item_update { 621sub item_update {
634 my ($self, $item) = @_; 622 my ($self, $item) = @_;
635 623
… …
645 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 633 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
646 set_opencont ($::CONN, 0, "Floor"); 634 set_opencont ($::CONN, 0, "Floor");
647 635
648 } elsif ($item->{flags} & F_OPEN) { 636 } elsif ($item->{flags} & F_OPEN) {
649 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 637 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
638
650 } else { 639 } else {
640 $self->{update_container}{$item->{container}}++;
641 $self->update_containers;
651 if ($item->{container} == 0) { 642# if ($item->{container} == 0) {
652 update_floorbox; 643# update_floorbox;
653 update_container (0); 644# update_container (0);
654 } elsif ($item->{container} == $self->{player}{tag}) { 645# } elsif ($item->{container} == $self->{player}{tag}) {
655 $::INV->set_items ($self->{container}{$item->{container}}) 646# $::INV->set_items ($self->{container}{$item->{container}})
656 } 647# }
657 } 648 }
658} 649}
659 650
660sub player_update { 651sub player_update {
661 my ($self, $player) = @_; 652 my ($self, $player) = @_;
… …
812} 803}
813 804
814sub feed { 805sub feed {
815 my ($self, $data) = @_; 806 my ($self, $data) = @_;
816 807
808 Scalar::Util::weaken $self;
809
817 my ($type, $msg) = split / /, $data, 2; 810 my ($type, $msg) = split / /, $data, 2;
818 811
819 if ($type eq "msg") { 812 if ($type eq "msg") {
820 my ($msg, @kw) = split /\x00/, $msg; 813 my ($msg, @kw) = split /\x00/, $msg;
821 $self->{kw}{$_} = 1 for @kw; 814 $self->{kw}{$_} = 1 for @kw;
… …
824 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 817 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
825 my @link; 818 my @link;
826 $msg =~ s{ 819 $msg =~ s{
827 ($match) 820 ($match)
828 }{ 821 }{
822 my $kw = $1;
823
829 push @link, new CFClient::UI::Label 824 push @link, new CFClient::UI::Label
830 markup => "<span foreground='#c0c0ff' underline='single'>$1</span>", 825 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
831 can_hover => 1, 826 can_hover => 1,
832 can_events => 1; 827 can_events => 1,
828 padding_x => 0,
829 padding_y => 0,
830 on_button_up => sub {
831 $self->send ($kw);
832 };
833 833
834 chr 0xfffc 834 chr 0xfffc
835 }giex; 835 }giex;
836 836
837 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 837 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
838 $self->{textview}->scroll_to_bottom;
838 $self->update_options; 839 $self->update_options;
839 } else { 840 } else {
840 $self->destroy; 841 $self->destroy;
841 } 842 }
842 843
… …
846sub send { 847sub send {
847 my ($self, $msg) = @_; 848 my ($self, $msg) = @_;
848 849
849 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 850 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
850 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 851 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
852 $self->{textview}->scroll_to_bottom;
851} 853}
852 854
853sub destroy { 855sub destroy {
854 my ($self) = @_; 856 my ($self) = @_;
855 857

Diff Legend

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