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

Diff Legend

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