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.51 by root, Sun Jul 2 21:07:26 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
… …
438 # try to create single paragraphs of multiple lines sent by the server 438 # try to create single paragraphs of multiple lines sent by the server
439 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 439 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
440 $spell->{message} =~ s/\n+$//; 440 $spell->{message} =~ s/\n+$//;
441 $spell->{message} ||= "Server did not provide a description for this spell."; 441 $spell->{message} ||= "Server did not provide a description for this spell.";
442 442
443 $::SETUP_SPELLS->add_spell ($spell); 443 $::SPELL_PAGE->add_spell ($spell);
444 444
445 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 445 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
446 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 446 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
447} 447}
448 448
449sub spell_delete { 449sub spell_delete {
450 my ($self, $spell) = @_; 450 my ($self, $spell) = @_;
451
451 $::SETUP_SPELLS->remove_spell ($spell); 452 $::SPELL_PAGE->remove_spell ($spell);
452} 453}
453 454
454sub addme_success { 455sub addme_success {
455 my ($self) = @_; 456 my ($self) = @_;
456 457
… …
523 return unless $::CONN; 524 return unless $::CONN;
524 525
525 $::FLOORBOX->clear; 526 $::FLOORBOX->clear;
526 527
527 my $row; 528 my $row;
528 for (@{ $::CONN->{container}{0} }) { 529 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
529 if ($row < 6) { 530 if ($row < 6) {
530 local $_->{face_widget}; # hack to force recreation of widget 531 local $_->{face_widget}; # hack to force recreation of widget
531 local $_->{desc_widget}; # hack to force recreation of widget 532 local $_->{desc_widget}; # hack to force recreation of widget
532 CFClient::Item::update_widgets $_; 533 CFClient::Item::update_widgets $_;
533 534
… …
536 537
537 $row++; 538 $row++;
538 } else { 539 } else {
539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 540 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
540 text => "More...", 541 text => "More...",
541 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 }, 542 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
542 ); 543 );
543 last; 544 last;
544 } 545 }
545 } 546 }
546 }); 547 });
… …
569 } 570 }
570 571
571 $::INVR->set_items ($conn->{container}{$tag}); 572 $::INVR->set_items ($conn->{container}{$tag});
572} 573}
573 574
574sub update_container { 575sub update_containers {
575 my ($tag) = @_; 576 my ($self) = @_;
576 577
577 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 578 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
579 for my $tag (keys %{ delete $self->{update_container} }) {
580 if ($tag == 0) {
581 update_floorbox;
582 $::INVR->set_items ($self->{container}{0})
578 if $tag == $::CONN->{open_container}; 583 if $tag == $self->{open_container};
584 } elsif ($tag == $self->{player}{tag}) {
585 $::INV->set_items ($self->{container}{$tag})
586 } else {
587 $::INVR->set_items ($self->{container}{$tag})
588 if $tag == $self->{open_container};
589 }
590 }
591 });
579} 592}
580 593
581sub container_add { 594sub container_add {
582 my ($self, $tag, $items) = @_; 595 my ($self, $tag, $items) = @_;
583 596
584 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 597 $self->{update_container}{$tag}++;
585 598 $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} 599}
598 600
599sub container_clear { 601sub container_clear {
600 my ($self, $tag) = @_; 602 my ($self, $tag) = @_;
601 603
602 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 604 $self->{update_container}{$tag}++;
603 605 $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} 606}
615 607
616sub item_delete { 608sub item_delete {
617 my ($self, @items) = @_; 609 my ($self, @items) = @_;
618 610
611 $self->{update_container}{$_->{container}}++
619 for (@items) { 612 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 } 613
614 $self->update_containers;
631} 615}
632 616
633sub item_update { 617sub item_update {
634 my ($self, $item) = @_; 618 my ($self, $item) = @_;
635 619
636 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 620 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
637 621
638 if ($item->{tag} == $self->{player}{tag}) {
639 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
640 return;
641 }
642
643 CFClient::Item::update_widgets $item; 622 CFClient::Item::update_widgets $item;
644 623
645 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 624 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
646 set_opencont ($::CONN, 0, "Floor"); 625 set_opencont ($::CONN, 0, "Floor");
647 626
648 } elsif ($item->{flags} & F_OPEN) { 627 } elsif ($item->{flags} & F_OPEN) {
649 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 628 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
629
650 } else { 630 } else {
631 $self->{update_container}{$item->{container}}++;
632 $self->update_containers;
651 if ($item->{container} == 0) { 633# if ($item->{container} == 0) {
652 update_floorbox; 634# update_floorbox;
653 update_container (0); 635# update_container (0);
654 } elsif ($item->{container} == $self->{player}{tag}) { 636# } elsif ($item->{container} == $self->{player}{tag}) {
655 $::INV->set_items ($self->{container}{$item->{container}}) 637# $::INV->set_items ($self->{container}{$item->{container}})
656 } 638# }
657 } 639 }
658} 640}
659 641
660sub player_update { 642sub player_update {
661 my ($self, $player) = @_; 643 my ($self, $player) = @_;
662
663 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 644 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
664} 645}
665 646
666sub update_server_info { 647sub update_server_info {
667 my ($self) = @_; 648 my ($self) = @_;
… …
812} 793}
813 794
814sub feed { 795sub feed {
815 my ($self, $data) = @_; 796 my ($self, $data) = @_;
816 797
798 Scalar::Util::weaken $self;
799
817 my ($type, $msg) = split / /, $data, 2; 800 my ($type, $msg) = split / /, $data, 2;
818 801
819 if ($type eq "msg") { 802 if ($type eq "msg") {
820 my ($msg, @kw) = split /\x00/, $msg; 803 my ($msg, @kw) = split /\x00/, $msg;
821 $self->{kw}{$_} = 1 for @kw; 804 $self->{kw}{$_} = 1 for @kw;
… …
824 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 807 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
825 my @link; 808 my @link;
826 $msg =~ s{ 809 $msg =~ s{
827 ($match) 810 ($match)
828 }{ 811 }{
812 my $kw = $1;
813
829 push @link, new CFClient::UI::Label 814 push @link, new CFClient::UI::Label
830 markup => "<span foreground='#c0c0ff' underline='single'>$1</span>", 815 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
831 can_hover => 1, 816 can_hover => 1,
832 can_events => 1; 817 can_events => 1,
818 padding_x => 0,
819 padding_y => 0,
820 on_button_up => sub {
821 $self->send ($kw);
822 };
833 823
834 chr 0xfffc 824 chr 0xfffc
835 }giex; 825 }giex;
836 826
837 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 827 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
828 $self->{textview}->scroll_to_bottom;
838 $self->update_options; 829 $self->update_options;
839 } else { 830 } else {
840 $self->destroy; 831 $self->destroy;
841 } 832 }
842 833
… …
846sub send { 837sub send {
847 my ($self, $msg) = @_; 838 my ($self, $msg) = @_;
848 839
849 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 840 $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); 841 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
842 $self->{textview}->scroll_to_bottom;
851} 843}
852 844
853sub destroy { 845sub destroy {
854 my ($self) = @_; 846 my ($self) = @_;
855 847

Diff Legend

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