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.69 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.73 by root, Sun Aug 13 15:14:17 2006 UTC

… …
16 16
17 my $self = $class->SUPER::new (@_); 17 my $self = $class->SUPER::new (@_);
18 18
19 $self->{map_widget}->clr_commands; 19 $self->{map_widget}->clr_commands;
20 20
21 my $cmd_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub { 21 my @cmd_help = map {
22 my ($pom) = @_;
23
24 my @cmd_help;
25
26 for my $head2 ($pom->head1->[-2]->head2) {
27 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
28 or next; 23 or die "unparseable command help: $_->{kw}[0]";
29 24
30 my $cmd = $1; 25 my $cmd = $1;
31 my @args = split /\|/, $2; 26 my @args = split /\|/, $2;
32 @args = (".*") unless @args; 27 @args = (".*") unless @args;
33 28
29 my (undef, @par) = CFPlus::Pod::section_of $_;
30 my $text = CFPlus::Pod::as_label @par;
31
34 $_ = $_ eq ".*" ? "" : " $_" 32 $_ = $_ eq ".*" ? "" : " $_"
35 for @args; 33 for @args;
36 34
37 my $text = CFPlus::Pod::as_markup $head2->content; 35 map ["$cmd$_", $text],
38
39 push @cmd_help, ["$cmd$_", $text]
40 for sort { (length $a) <=> (length $b) } 36 sort { (length $a) <=> (length $b) }
41 @args; 37 @args
42 } 38 } CFPlus::Pod::find command_help => "*";
43 39
44 \@cmd_help
45 };
46
47 $self->{map_widget}->add_command (@$_) 40 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 41 for @cmd_help;
49 42
50 $self->{noface} = new_from_file CFPlus::Texture 43 $self->{noface} = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 44 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
52 45
53 $self->{open_container} = 0; 46 $self->{open_container} = 0;
… …
636 $self->{logview}->scroll_to_bottom; 629 $self->{logview}->scroll_to_bottom;
637 630
638 $self->{statusbox}->add ($text, 631 $self->{statusbox}->add ($text,
639 group => $text, 632 group => $text,
640 fg => $color[$color], 633 fg => $color[$color],
641 timeout => $color >= 2 ? 60 : 10, 634 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 635 tooltip_font => $::FONT_FIXED,
643 ); 636 );
644} 637}
645 638
646sub drawextinfo { 639sub drawextinfo {
… …
670} 663}
671 664
672sub addme_success { 665sub addme_success {
673 my ($self) = @_; 666 my ($self) = @_;
674 667
675 my $skill_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
676 my ($pom) = @_;
677
678 my %skill_help; 668 my %skill_help;
679 669
680 for my $head2 ($pom->head1->[3]->head2) { 670 for my $node (CFPlus::Pod::find skill_description => "*") {
681 $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content; 671 my (undef, @par) = CFPlus::Pod::section_of $node;
682 } 672 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684 \%skill_help
685 }; 673 };
686 674
687 for my $skill (values %{$self->{skill_info}}) { 675 for my $skill (values %{$self->{skill_info}}) {
688 $self->{map_widget}->add_command ("ready_skill $skill", 676 $self->{map_widget}->add_command ("ready_skill $skill",
689 (CFPlus::asxml "Ready the skill '$skill'\n\n") 677 (CFPlus::asxml "Ready the skill '$skill'\n\n")
690 . $skill_help->{$skill}); 678 . $skill_help{$skill});
691 $self->{map_widget}->add_command ("use_skill $skill", 679 $self->{map_widget}->add_command ("use_skill $skill",
692 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 680 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693 . $skill_help->{$skill}); 681 . $skill_help{$skill});
694 } 682 }
695} 683}
696 684
697sub eof { 685sub eof {
698 my ($self) = @_; 686 my ($self) = @_;
… …
894} 882}
895 883
896sub logged_in { 884sub logged_in {
897 my ($self) = @_; 885 my ($self) = @_;
898 886
899 $self->send_ext_req (cfplus_support => "1", sub { 887 $self->send_ext_req (cfplus_support => version => 1, sub {
900 $self->{cfplus_ext} = $_[0]; 888 $self->{cfplus_ext} = $_[0]{version};
901 $self->update_server_info; 889 $self->update_server_info;
890
891 0
902 }); 892 });
903 893
904 $self->update_server_info; 894 $self->update_server_info;
905 895
906 $self->send_command ("output-sync $::CFG->{output_sync}"); 896 $self->send_command ("output-sync $::CFG->{output_sync}");
… …
910 900
911sub lookat { 901sub lookat {
912 my ($self, $x, $y) = @_; 902 my ($self, $x, $y) = @_;
913 903
914 if ($self->{cfplus_ext}) { 904 if ($self->{cfplus_ext}) {
915 $self->send_ext_req (lookat => "$x $y", sub { 905 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
916 my %res = split /\x00/, $_[0]; 906 my ($msg) = @_;
917 907
918 if (exists $res{npc_dialog}) { 908 if (exists $msg->{npc_dialog}) {
919 # start npc chat dialog 909 # start npc chat dialog
920 $self->{npc_dialog} = new CFPlus::NPCDialog:: 910 $self->{npc_dialog} = new CFPlus::NPCDialog::
921 dx => $x, 911 dx => $x,
922 dy => $y, 912 dy => $y,
923 title => "$res{npc_dialog} (NPC)", 913 title => "$msg->{npc_dialog} (NPC)",
924 conn => $self, 914 conn => $self,
925 ; 915 ;
926 } 916 }
927 }); 917 });
928 } 918 }
… …
968 958
969 $hbox->add (my $vbox = new CFPlus::UI::VBox); 959 $hbox->add (my $vbox = new CFPlus::UI::VBox);
970 960
971 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 961 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 962 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
973 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 963 tooltip => "#npc_message_entry",
974 . "Sometimes you have to tell an NPC something you cannot find out during "
975 . "a normal conversation (such as a password). In those cases you have to use "
976 . "this text entry. You can also enter responses manually instead of using the response "
977 . "buttons below.",
978 on_activate => sub { 964 on_activate => sub {
979 my ($entry, $text) = @_; 965 my ($entry, $text) = @_;
980 966
981 return unless $text =~ /\S/; 967 return unless $text =~ /\S/;
982 968
… …
995 on_activate => sub { $this->destroy; 1 }, 981 on_activate => sub { $this->destroy; 1 },
996 ; 982 ;
997 983
998 $self->update_options; 984 $self->update_options;
999 985
1000 $self->{token} = $self->{conn}->ext_token; 986 $self->{id} = $self->{conn}->send_ext_req (
1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 987 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
1002 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 988 sub { $this && $this->feed (@_) }
989 );
1003 990
1004 $self->{entry}->grab_focus; 991 $self->{entry}->grab_focus;
1005 992
1006 $self->{textview}->add_paragraph ({ 993 $self->{textview}->add_paragraph ({
1007 fg => [1, 1, 0, 1], 994 fg => [1, 1, 0, 1],
… …
1030 ); 1017 );
1031 } 1018 }
1032} 1019}
1033 1020
1034sub feed { 1021sub feed {
1035 my ($self, $data) = @_; 1022 my ($self, $msg) = @_;
1036 1023
1037 Scalar::Util::weaken $self; 1024 Scalar::Util::weaken $self;
1038 1025
1039 my ($type, $msg) = split / /, $data, 2; 1026 if ($msg->{msgtype} eq "reply") {
1027 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1028 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1040 1029
1041 if ($type eq "msg") {
1042 my ($msg, @kw) = split /\x00/, $msg;
1043
1044 utf8::decode $_ for ($msg, @kw);
1045
1046 $self->{kw}{$_} = 1 for @kw;
1047
1048 $msg = "\n" . CFPlus::UI::asxml $msg; 1030 my $text = "\n" . CFPlus::asxml $msg->{msg};
1049 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1031 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1050 my @link; 1032 my @link;
1051 $msg =~ s{ 1033 $text =~ s{
1052 ($match) 1034 ($match)
1053 }{ 1035 }{
1054 my $kw = $1; 1036 my $kw = $1;
1055 1037
1056 push @link, new CFPlus::UI::Label 1038 push @link, new CFPlus::UI::Label
… …
1064 }; 1046 };
1065 1047
1066 chr 0xfffc 1048 chr 0xfffc
1067 }giex; 1049 }giex;
1068 1050
1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1051 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1070 $self->{textview}->scroll_to_bottom; 1052 $self->{textview}->scroll_to_bottom;
1071 $self->update_options; 1053 $self->update_options;
1072 } else { 1054 } else {
1073 $self->destroy; 1055 $self->destroy;
1074 } 1056 }
… …
1080 my ($self, $msg) = @_; 1062 my ($self, $msg) = @_;
1081 1063
1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1064 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083 $self->{textview}->scroll_to_bottom; 1065 $self->{textview}->scroll_to_bottom;
1084 1066
1085 utf8::encode $msg; 1067 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1086 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1087} 1068}
1088 1069
1089sub destroy { 1070sub destroy {
1090 my ($self) = @_; 1071 my ($self) = @_;
1091 1072
1092 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1073 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1093 1074
1075 if ($self->{conn}) {
1094 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1076 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1095 delete $self->{conn}{npc_dialog}; 1077 delete $self->{conn}{npc_dialog};
1096 $self->{conn}->disconnect_ext ($self->{token}); 1078 $self->{conn}->disconnect_ext ($self->{id});
1079 }
1097 1080
1098 $self->SUPER::destroy; 1081 $self->SUPER::destroy;
1099} 1082}
1100 1083
11011 10841

Diff Legend

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