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.87 by root, Tue Nov 7 22:41:27 2006 UTC

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

Diff Legend

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