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.86 by root, Sun Oct 8 21:22:30 2006 UTC

… …
12use base 'Crossfire::Protocol::Base'; 12use base 'Crossfire::Protocol::Base';
13 13
14sub new { 14sub new {
15 my $class = shift; 15 my $class = shift;
16 16
17 my $self = $class->SUPER::new (@_); 17 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
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 } sort { $a->{par} <=> $b->{par} }
39 CFPlus::Pod::find command => "*";
43 40
44 \@cmd_help
45 };
46
47 $self->{map_widget}->add_command (@$_) 41 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 42 for @cmd_help;
49 43
50 $self->{noface} = new_from_file CFPlus::Texture 44 $self->{noface} = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
52 46
47 {
48 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
49 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
50 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
51 }
52
53 $self->{open_container} = 0; 53 $self->{open_container} = 0;
54 54
55 # "global" 55 # "global"
56 $self->{tilecache} = CFPlus::db_table "tilecache"; 56 $self->{tilecache} = CFPlus::db_table "tilecache"
57 or die "tilecache: unable to open database table";
57 $self->{facemap} = CFPlus::db_table "facemap"; 58 $self->{facemap} = CFPlus::db_table "facemap"
59 or die "facemap: unable to open database table";
58 60
59 # per server 61 # per server
60 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 62 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
63 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
61 64
62 $self 65 $self
63} 66}
64 67
65sub logprint { 68sub logprint {
… …
265 268
266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 269 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267 270
268 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 271 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
269 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 272 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
270 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
271 273
272 my ($x, $y) = (0, 1); 274 my ($x, $y) = (0, 1);
273 for ( 275 for (
274 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 276 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
275 map [$_, $self->{skill_info}{$_}], 277 map [$_, $self->{skill_info}{$_}],
… …
301 303
302 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 304 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
303 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 305 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
304 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 306 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
305 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 307 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
306 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 308 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
309 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
307 310
308 $x++ and ($x, $y) = (0, $y + 1); 311 $x++ and ($x, $y) = (0, $y + 1);
309 } 312 }
310 } 313 }
311 314
… …
345} 348}
346 349
347sub feed_map1a { 350sub feed_map1a {
348 my ($self, $data) = @_; 351 my ($self, $data) = @_;
349 352
350 $self->{map}->map1a_update ($data); 353 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
351 $self->{map_widget}->update; 354 $self->{map_widget}->update;
352} 355}
353 356
354sub magicmap { 357sub magicmap {
355 my ($self, $w, $h, $x, $y, $data) = @_; 358 my ($self, $w, $h, $x, $y, $data) = @_;
… …
620 [0.74, 0.65, 0.41], 623 [0.74, 0.65, 0.41],
621 ); 624 );
622 625
623 $self->logprint ("info: ", $text); 626 $self->logprint ("info: ", $text);
624 627
625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
626
627 # try to create single paragraphs of multiple lines sent by the server 628 # try to create single paragraphs of multiple lines sent by the server
628 $text =~ s/(?<=\S)\n(?=\w)/ /g; 629 $text =~ s/(?<=\S)\n(?=\w)/ /g;
629 630
630 $text = CFPlus::asxml $text; 631 $text = CFPlus::asxml $text;
631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 632 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 633 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
633 634
634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 635 ::message ({ fg => $color[$color], markup => $_ })
635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 636 for split /\n/, $text;
636 $self->{logview}->scroll_to_bottom;
637 637
638 $self->{statusbox}->add ($text, 638 $self->{statusbox}->add ($text,
639 group => $text, 639 group => $text,
640 fg => $color[$color], 640 fg => $color[$color],
641 timeout => $color >= 2 ? 60 : 10, 641 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 642 tooltip_font => $::FONT_FIXED,
643 ); 643 );
644} 644}
645 645
646sub drawextinfo { 646sub drawextinfo {
… …
670} 670}
671 671
672sub addme_success { 672sub addme_success {
673 my ($self) = @_; 673 my ($self) = @_;
674 674
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; 675 my %skill_help;
679 676
680 for my $head2 ($pom->head1->[3]->head2) { 677 for my $node (CFPlus::Pod::find skill_description => "*") {
681 $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content; 678 my (undef, @par) = CFPlus::Pod::section_of $node;
682 } 679 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684 \%skill_help
685 }; 680 };
686 681
687 for my $skill (values %{$self->{skill_info}}) { 682 for my $skill (values %{$self->{skill_info}}) {
688 $self->{map_widget}->add_command ("ready_skill $skill", 683 $self->{map_widget}->add_command ("ready_skill $skill",
689 (CFPlus::asxml "Ready the skill '$skill'\n\n") 684 (CFPlus::asxml "Ready the skill '$skill'\n\n")
690 . $skill_help->{$skill}); 685 . $skill_help{$skill});
691 $self->{map_widget}->add_command ("use_skill $skill", 686 $self->{map_widget}->add_command ("use_skill $skill",
692 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 687 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693 . $skill_help->{$skill}); 688 . $skill_help{$skill});
694 } 689 }
695} 690}
696 691
697sub eof { 692sub eof {
698 my ($self) = @_; 693 my ($self) = @_;
… …
885 $::SERVER_INFO->set_markup ( 880 $::SERVER_INFO->set_markup (
886 "server <tt>$self->{host}:$self->{port}</tt>\n" 881 "server <tt>$self->{host}:$self->{port}</tt>\n"
887 . "protocol version <tt>$self->{version}</tt>\n" 882 . "protocol version <tt>$self->{version}</tt>\n"
888 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 883 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
889 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 884 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
885 . "editing support $yesno[!!$self->{editor_support}]\n"
886 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
890 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 887 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
891 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 888 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
892 . "map size $self->{mapw}×$self->{maph}\n" 889 . "map size $self->{mapw}×$self->{maph}\n"
893 ); 890 );
894} 891}
895 892
896sub logged_in { 893sub logged_in {
897 my ($self) = @_; 894 my ($self) = @_;
898 895
899 $self->send_ext_req (cfplus_support => "1", sub { 896 $self->send_ext_req (cfplus_support => version => 1, sub {
900 $self->{cfplus_ext} = $_[0]; 897 $self->{cfplus_ext} = $_[0]{version};
901 $self->update_server_info; 898 $self->update_server_info;
899
900 if ($self->{cfplus_ext} >= 2) {
901 $self->send_ext_req ("editor_support", sub {
902 $self->{editor_support} = $_[0];
903 $self->update_server_info;
904
905 0
906 });
907 }
908
909 0
902 }); 910 });
903 911
904 $self->update_server_info; 912 $self->update_server_info;
905 913
906 $self->send_command ("output-sync $::CFG->{output_sync}"); 914 $self->send_command ("output-sync $::CFG->{output_sync}");
… …
910 918
911sub lookat { 919sub lookat {
912 my ($self, $x, $y) = @_; 920 my ($self, $x, $y) = @_;
913 921
914 if ($self->{cfplus_ext}) { 922 if ($self->{cfplus_ext}) {
915 $self->send_ext_req (lookat => "$x $y", sub { 923 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
916 my %res = split /\x00/, $_[0]; 924 my ($msg) = @_;
917 925
918 if (exists $res{npc_dialog}) { 926 if (exists $msg->{npc_dialog}) {
919 # start npc chat dialog 927 # start npc chat dialog
920 $self->{npc_dialog} = new CFPlus::NPCDialog:: 928 $self->{npc_dialog} = new CFPlus::NPCDialog::
921 dx => $x, 929 dx => $x,
922 dy => $y, 930 dy => $y,
923 title => "$res{npc_dialog} (NPC)", 931 title => "$msg->{npc_dialog} (NPC)",
924 conn => $self, 932 conn => $self,
925 ; 933 ;
926 } 934 }
927 }); 935 });
928 } 936 }
… …
931} 939}
932 940
933sub destroy { 941sub destroy {
934 my ($self) = @_; 942 my ($self) = @_;
935 943
936 $self->{npc_dialog}->destroy 944 (delete $self->{npc_dialog})->destroy
937 if $self->{npc_dialog}; 945 if $self->{npc_dialog};
938 946
939 $self->SUPER::destroy; 947 $self->SUPER::destroy;
940} 948}
941 949
942package CFPlus::NPCDialog; 950package CFPlus::NPCDialog;
943 951
944our @ISA = 'CFPlus::UI::FancyFrame'; 952our @ISA = 'CFPlus::UI::Toplevel';
945 953
946sub new { 954sub new {
947 my $class = shift; 955 my $class = shift;
948 956
949 my $self = $class->SUPER::new ( 957 my $self = $class->SUPER::new (
… …
968 976
969 $hbox->add (my $vbox = new CFPlus::UI::VBox); 977 $hbox->add (my $vbox = new CFPlus::UI::VBox);
970 978
971 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 979 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 980 $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" 981 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 { 982 on_activate => sub {
979 my ($entry, $text) = @_; 983 my ($entry, $text) = @_;
980 984
981 return unless $text =~ /\S/; 985 return unless $text =~ /\S/;
982 986
… …
995 on_activate => sub { $this->destroy; 1 }, 999 on_activate => sub { $this->destroy; 1 },
996 ; 1000 ;
997 1001
998 $self->update_options; 1002 $self->update_options;
999 1003
1000 $self->{token} = $self->{conn}->ext_token; 1004 $self->{id} = $self->{conn}->send_ext_req (
1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1005 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
1002 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1006 sub { $this && $this->feed (@_) }
1007 );
1003 1008
1004 $self->{entry}->grab_focus; 1009 $self->{entry}->grab_focus;
1005 1010
1006 $self->{textview}->add_paragraph ({ 1011 $self->{textview}->add_paragraph ({
1007 fg => [1, 1, 0, 1], 1012 fg => [1, 1, 0, 1],
… …
1030 ); 1035 );
1031 } 1036 }
1032} 1037}
1033 1038
1034sub feed { 1039sub feed {
1035 my ($self, $data) = @_; 1040 my ($self, $msg) = @_;
1036 1041
1037 Scalar::Util::weaken $self; 1042 Scalar::Util::weaken $self;
1038 1043
1039 my ($type, $msg) = split / /, $data, 2; 1044 if ($msg->{msgtype} eq "reply") {
1045 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1046 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1040 1047
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; 1048 my $text = "\n" . CFPlus::asxml $msg->{msg};
1049 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1049 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1050 my @link; 1050 my @link;
1051 $msg =~ s{ 1051 $text =~ s{
1052 ($match) 1052 ($match)
1053 }{ 1053 }{
1054 my $kw = $1; 1054 my $kw = $1;
1055 1055
1056 push @link, new CFPlus::UI::Label 1056 push @link, new CFPlus::UI::Label
… …
1061 padding_y => 0, 1061 padding_y => 0,
1062 on_button_up => sub { 1062 on_button_up => sub {
1063 $self->send ($kw); 1063 $self->send ($kw);
1064 }; 1064 };
1065 1065
1066 chr 0xfffc 1066 "\x{fffc}"
1067 }giex; 1067 }giex;
1068 1068
1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1069 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1070 $self->{textview}->scroll_to_bottom; 1070 $self->{textview}->scroll_to_bottom;
1071 $self->update_options; 1071 $self->update_options;
1072 } else { 1072 } else {
1073 $self->destroy; 1073 $self->destroy;
1074 } 1074 }
… …
1080 my ($self, $msg) = @_; 1080 my ($self, $msg) = @_;
1081 1081
1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083 $self->{textview}->scroll_to_bottom; 1083 $self->{textview}->scroll_to_bottom;
1084 1084
1085 utf8::encode $msg; 1085 $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} 1086}
1088 1087
1089sub destroy { 1088sub destroy {
1090 my ($self) = @_; 1089 my ($self) = @_;
1091 1090
1092 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1091 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1093 1092
1093 if ($self->{conn}) {
1094 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1094 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1095 delete $self->{conn}{npc_dialog}; 1095 delete $self->{conn}{npc_dialog};
1096 $self->{conn}->disconnect_ext ($self->{token}); 1096 $self->{conn}->disconnect_ext ($self->{id});
1097 }
1097 1098
1098 $self->SUPER::destroy; 1099 $self->SUPER::destroy;
1099} 1100}
1100 1101
11011 11021
1103

Diff Legend

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