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.37 by root, Thu Jun 15 15:47:36 2006 UTC vs.
Revision 1.51 by root, Sun Jul 2 21:07:26 2006 UTC

… …
83 83
84 print $fh "$ts ", @a, "\n"; 84 print $fh "$ts ", @a, "\n";
85 $fh->flush; 85 $fh->flush;
86} 86}
87 87
88
89
90sub stats_update { 88sub stats_update {
91 my ($self, $stats) = @_; 89 my ($self, $stats) = @_;
92 90
93 if (my $exp = $stats->{+CS_STAT_EXP64}) { 91 if (my $exp = $stats->{+CS_STAT_EXP64}) {
94 my $diff = $exp - $self->{prev_exp}; 92 my $diff = $exp - $self->{prev_exp};
… …
107 push @{$self->{record}}, $command; 105 push @{$self->{record}}, $command;
108 } 106 }
109 107
110 $self->logprint ("send: ", $command); 108 $self->logprint ("send: ", $command);
111 $self->send_command ($command); 109 $self->send_command ($command);
112 ::status $command; 110 ::status ($command);
113} 111}
114 112
115sub start_record { 113sub start_record {
116 my ($self) = @_; 114 my ($self) = @_;
117 115
… …
414 412
415 $text = CFClient::UI::Label::escape $text; 413 $text = CFClient::UI::Label::escape $text;
416 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
417 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
418 416
419 $self->{logview}->add_paragraph ($color[$color], 417 $self->{logview}->add_paragraph ($color[$color], $_)
420 join "\n", map "$time $_", split /\n/, $text); 418 for map "$time $_", split /\n/, $text;
419 $self->{logview}->scroll_to_bottom;
421 420
422 $self->{statusbox}->add ($text, 421 $self->{statusbox}->add ($text,
423 group => $text, 422 group => $text,
424 fg => $color[$color], 423 fg => $color[$color],
425 timeout => $color >= 2 ? 60 : 10, 424 timeout => $color >= 2 ? 60 : 10,
… …
439 # 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
440 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 439 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
441 $spell->{message} =~ s/\n+$//; 440 $spell->{message} =~ s/\n+$//;
442 $spell->{message} ||= "Server did not provide a description for this spell."; 441 $spell->{message} ||= "Server did not provide a description for this spell.";
443 442
444 $::SETUP_SPELLS->add_spell ($spell); 443 $::SPELL_PAGE->add_spell ($spell);
445 444
446 $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});
447 $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});
448} 447}
449 448
450sub spell_delete { 449sub spell_delete {
451 my ($self, $spell) = @_; 450 my ($self, $spell) = @_;
451
452 $::SETUP_SPELLS->remove_spell ($spell); 452 $::SPELL_PAGE->remove_spell ($spell);
453} 453}
454 454
455sub addme_success { 455sub addme_success {
456 my ($self) = @_; 456 my ($self) = @_;
457 457
… …
524 return unless $::CONN; 524 return unless $::CONN;
525 525
526 $::FLOORBOX->clear; 526 $::FLOORBOX->clear;
527 527
528 my $row; 528 my $row;
529 for (@{ $::CONN->{container}{0} }) { 529 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
530 if ($row < 6) { 530 if ($row < 6) {
531 local $_->{face_widget}; # hack to force recreation of widget 531 local $_->{face_widget}; # hack to force recreation of widget
532 local $_->{desc_widget}; # hack to force recreation of widget 532 local $_->{desc_widget}; # hack to force recreation of widget
533 CFClient::Item::update_widgets $_; 533 CFClient::Item::update_widgets $_;
534 534
… …
537 537
538 $row++; 538 $row++;
539 } else { 539 } else {
540 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 540 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
541 text => "More...", 541 text => "More...",
542 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 542 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
543 ); 543 );
544 last; 544 last;
545 } 545 }
546 } 546 }
547 }); 547 });
… …
562 tooltip => "Close the currently open container (if one is open)", 562 tooltip => "Close the currently open container (if one is open)",
563 on_activate => sub { 563 on_activate => sub {
564 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 564 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
565 if $tag != 0; 565 if $tag != 0;
566 #if $CONN->{open_container} != 0; 566 #if $CONN->{open_container} != 0;
567 0
567 }, 568 },
568 ); 569 );
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) = @_;
… …
763 744
764 return unless $text =~ /\S/; 745 return unless $text =~ /\S/;
765 746
766 $entry->set_text (""); 747 $entry->set_text ("");
767 $this->send ($text); 748 $this->send ($text);
749
750 0
768 }, 751 },
769 ); 752 );
770 753
771 $vbox->add ($self->{options} = new CFClient::UI::VBox); 754 $vbox->add ($self->{options} = new CFClient::UI::VBox);
772 755
773 $self->{close_button} = new CFClient::UI::Button 756 $self->{bye_button} = new CFClient::UI::Button
774 text => "Bye (close)", 757 text => "Bye (close)",
775 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 758 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
776 on_activate => sub { $this->destroy }, 759 on_activate => sub { $this->destroy; 0 },
777 ; 760 ;
778 761
779 $self->update_options; 762 $self->update_options;
780 763
781 $self->{token} = $self->{conn}->ext_token; 764 $self->{token} = $self->{conn}->ext_token;
782 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 765 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
783 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 766 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
784 767
785 $self->{entry}->focus_in; 768 $self->{entry}->grab_focus;
786 769
787 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 770 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
788 771
789 $self->show; 772 $self->show;
790 $self 773 $self
… …
794 my ($self) = @_; 777 my ($self) = @_;
795 778
796 Scalar::Util::weaken $self; 779 Scalar::Util::weaken $self;
797 780
798 $self->{options}->clear; 781 $self->{options}->clear;
799 $self->{options}->add ($self->{close_button}); 782 $self->{options}->add ($self->{bye_button});
800 783
801 for my $kw (sort keys %{ $self->{kw} }) { 784 for my $kw (sort keys %{ $self->{kw} }) {
802 $self->{options}->add (new CFClient::UI::Button 785 $self->{options}->add (new CFClient::UI::Button
803 text => $kw, 786 text => $kw,
804 on_activate => sub { 787 on_activate => sub {
805 $self->send ($kw); 788 $self->send ($kw);
789 0
806 }, 790 },
807 ); 791 );
808 } 792 }
809} 793}
810 794
811sub feed { 795sub feed {
812 my ($self, $data) = @_; 796 my ($self, $data) = @_;
797
798 Scalar::Util::weaken $self;
813 799
814 my ($type, $msg) = split / /, $data, 2; 800 my ($type, $msg) = split / /, $data, 2;
815 801
816 if ($type eq "msg") { 802 if ($type eq "msg") {
817 my ($msg, @kw) = split /\x00/, $msg; 803 my ($msg, @kw) = split /\x00/, $msg;
818 $self->{kw}{$_} = 1 for @kw; 804 $self->{kw}{$_} = 1 for @kw;
819 805
820 $msg = CFClient::UI::Label::escape $msg; 806 $msg = "\n" . CFClient::UI::Label::escape $msg;
821 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} };
822 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh. 808 my @link;
809 $msg =~ s{
810 ($match)
811 }{
812 my $kw = $1;
813
814 push @link, new CFClient::UI::Label
815 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
816 can_hover => 1,
817 can_events => 1,
818 padding_x => 0,
819 padding_y => 0,
820 on_button_up => sub {
821 $self->send ($kw);
822 };
823
824 chr 0xfffc
825 }giex;
823 826
824 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 827 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
828 $self->{textview}->scroll_to_bottom;
825 $self->update_options; 829 $self->update_options;
826 } else { 830 } else {
827 $self->destroy; 831 $self->destroy;
828 } 832 }
829 833
… …
833sub send { 837sub send {
834 my ($self, $msg) = @_; 838 my ($self, $msg) = @_;
835 839
836 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 840 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
837 $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;
838} 843}
839 844
840sub destroy { 845sub destroy {
841 my ($self) = @_; 846 my ($self) = @_;
842 847
843 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1 848 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
844 849
845 delete $self->{conn}{npc_dialog}; 850 delete $self->{conn}{npc_dialog};
846 $self->{conn}->disconnect_ext ($self->{token}); 851 $self->{conn}->disconnect_ext ($self->{token});
847 852
848 $self->SUPER::destroy; 853 $self->SUPER::destroy;

Diff Legend

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