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.49 by root, Wed Jun 28 23:39: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
… …
569 } 569 }
570 570
571 $::INVR->set_items ($conn->{container}{$tag}); 571 $::INVR->set_items ($conn->{container}{$tag});
572} 572}
573 573
574sub update_container { 574sub update_containers {
575 my ($tag) = @_; 575 my ($self) = @_;
576 576
577 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 577 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
578 for my $tag (keys %{ delete $self->{update_container} }) {
579 if ($tag == 0) {
580 update_floorbox;
581 $::INVR->set_items ($self->{container}{0})
578 if $tag == $::CONN->{open_container}; 582 if $tag == $self->{open_container};
583 } elsif ($tag == $self->{player}{tag}) {
584 $::INV->set_items ($self->{container}{$tag})
585 } else {
586 $::INVR->set_items ($self->{container}{$tag})
587 if $tag == $self->{open_container};
588 }
589 }
590 });
579} 591}
580 592
581sub container_add { 593sub container_add {
582 my ($self, $tag, $items) = @_; 594 my ($self, $tag, $items) = @_;
583 595
584 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 596 $self->{update_container}{$tag}++;
585 597 $self->update_containers;
586 if ($tag == 0) {
587 update_floorbox;
588 update_container (0);
589 } elsif ($tag == $self->{player}{tag}) {
590 $::INV->set_items ($self->{container}{$self->{player}{tag}})
591 } else {
592 update_container ($tag);
593 }
594
595 # $self-<{player}{tag} => player inv
596 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
597} 598}
598 599
599sub container_clear { 600sub container_clear {
600 my ($self, $tag) = @_; 601 my ($self, $tag) = @_;
601 602
602 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 603 $self->{update_container}{$tag}++;
603 604 $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} 605}
615 606
616sub item_delete { 607sub item_delete {
617 my ($self, @items) = @_; 608 my ($self, @items) = @_;
618 609
610 $self->{update_container}{$_->{container}}++
619 for (@items) { 611 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 } 612
613 $self->update_containers;
631} 614}
632 615
633sub item_update { 616sub item_update {
634 my ($self, $item) = @_; 617 my ($self, $item) = @_;
635 618
… …
645 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 628 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
646 set_opencont ($::CONN, 0, "Floor"); 629 set_opencont ($::CONN, 0, "Floor");
647 630
648 } elsif ($item->{flags} & F_OPEN) { 631 } elsif ($item->{flags} & F_OPEN) {
649 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 632 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
633
650 } else { 634 } else {
635 $self->{update_container}{$item->{container}}++;
636 $self->update_containers;
651 if ($item->{container} == 0) { 637# if ($item->{container} == 0) {
652 update_floorbox; 638# update_floorbox;
653 update_container (0); 639# update_container (0);
654 } elsif ($item->{container} == $self->{player}{tag}) { 640# } elsif ($item->{container} == $self->{player}{tag}) {
655 $::INV->set_items ($self->{container}{$item->{container}}) 641# $::INV->set_items ($self->{container}{$item->{container}})
656 } 642# }
657 } 643 }
658} 644}
659 645
660sub player_update { 646sub player_update {
661 my ($self, $player) = @_; 647 my ($self, $player) = @_;
… …
812} 798}
813 799
814sub feed { 800sub feed {
815 my ($self, $data) = @_; 801 my ($self, $data) = @_;
816 802
803 Scalar::Util::weaken $self;
804
817 my ($type, $msg) = split / /, $data, 2; 805 my ($type, $msg) = split / /, $data, 2;
818 806
819 if ($type eq "msg") { 807 if ($type eq "msg") {
820 my ($msg, @kw) = split /\x00/, $msg; 808 my ($msg, @kw) = split /\x00/, $msg;
821 $self->{kw}{$_} = 1 for @kw; 809 $self->{kw}{$_} = 1 for @kw;
… …
824 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 812 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
825 my @link; 813 my @link;
826 $msg =~ s{ 814 $msg =~ s{
827 ($match) 815 ($match)
828 }{ 816 }{
817 my $kw = $1;
818
829 push @link, new CFClient::UI::Label 819 push @link, new CFClient::UI::Label
830 markup => "<span foreground='#c0c0ff' underline='single'>$1</span>", 820 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
831 can_hover => 1, 821 can_hover => 1,
832 can_events => 1; 822 can_events => 1,
823 padding_x => 0,
824 padding_y => 0,
825 on_button_up => sub {
826 $self->send ($kw);
827 };
833 828
834 chr 0xfffc 829 chr 0xfffc
835 }giex; 830 }giex;
836 831
837 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 832 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
833 $self->{textview}->scroll_to_bottom;
838 $self->update_options; 834 $self->update_options;
839 } else { 835 } else {
840 $self->destroy; 836 $self->destroy;
841 } 837 }
842 838
… …
846sub send { 842sub send {
847 my ($self, $msg) = @_; 843 my ($self, $msg) = @_;
848 844
849 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 845 $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); 846 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
847 $self->{textview}->scroll_to_bottom;
851} 848}
852 849
853sub destroy { 850sub destroy {
854 my ($self) = @_; 851 my ($self) = @_;
855 852

Diff Legend

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