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.95 by root, Wed Apr 4 02:43:30 2007 UTC

… …
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::UI; 9use CFPlus::UI;
10use CFPlus::Pod; 10use CFPlus::Pod;
11use CFPlus::Macro;
12use CFPlus::Item;
13
14use Crossfire::Protocol::Base 0.95;
11 15
12use base 'Crossfire::Protocol::Base'; 16use base 'Crossfire::Protocol::Base';
13 17
14sub new { 18sub new {
15 my $class = shift; 19 my $class = shift;
16 20
17 my $self = $class->SUPER::new (@_); 21 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
18 22
19 $self->{map_widget}->clr_commands; 23 $self->{map_widget}->clr_commands;
20 24
21 my $cmd_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub { 25 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 26 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
28 or next; 27 or die "unparseable command help: $_->{kw}[0]";
29 28
30 my $cmd = $1; 29 my $cmd = $1;
31 my @args = split /\|/, $2; 30 my @args = split /\|/, $2;
32 @args = (".*") unless @args; 31 @args = (".*") unless @args;
33 32
33 my (undef, @par) = CFPlus::Pod::section_of $_;
34 my $text = CFPlus::Pod::as_label @par;
35
34 $_ = $_ eq ".*" ? "" : " $_" 36 $_ = $_ eq ".*" ? "" : " $_"
35 for @args; 37 for @args;
36 38
37 my $text = CFPlus::Pod::as_markup $head2->content; 39 map ["$cmd$_", $text],
38
39 push @cmd_help, ["$cmd$_", $text]
40 for sort { (length $a) <=> (length $b) } 40 sort { (length $a) <=> (length $b) }
41 @args; 41 @args
42 } sort { $a->{par} <=> $b->{par} }
43 CFPlus::Pod::find command => "*";
44
45 $self->connect_ext (event_capabilities => sub {
46 my ($cap) = @_;
47
48 if (my $ts = $cap->{tileset}) {
49 if (my ($default) = grep $_->[2] & 1, @$ts) {
50 $self->{tileset} = $default;
51 $self->{tilesize} = $default->[3];
52 $self->setup_req (tileset => $default->[0]);
53
54 my $w = int $self->{mapw} * 32 / $self->{tilesize};
55 my $h = int $self->{maph} * 32 / $self->{tilesize};
56
57 $self->setup_req (mapsize => "${w}x${h}");
58 }
42 } 59 }
43
44 \@cmd_help
45 }; 60 });
46 61
47 $self->{map_widget}->add_command (@$_) 62 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 63 for @cmd_help;
49 64
50 $self->{noface} = new_from_file CFPlus::Texture 65 $self->{noface} = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 66 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
52 67
68 {
69 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
70 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
71 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
72 }
73
53 $self->{open_container} = 0; 74 $self->{open_container} = 0;
54 75
55 # "global" 76 # "global"
56 $self->{tilecache} = CFPlus::db_table "tilecache"; 77 $self->{tilecache} = CFPlus::db_table "tilecache"
78 or die "tilecache: unable to open database table";
57 $self->{facemap} = CFPlus::db_table "facemap"; 79 $self->{facemap} = CFPlus::db_table "facemap"
80 or die "facemap: unable to open database table";
58 81
59 # per server 82 # per server
60 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 83 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
84 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
61 85
62 $self 86 $self
63} 87}
64 88
65sub logprint { 89sub logprint {
… …
265 289
266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 290 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267 291
268 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 292 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); 293 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 294
272 my ($x, $y) = (0, 1); 295 my ($x, $y) = (0, 1);
273 for ( 296 for (
274 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 297 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
275 map [$_, $self->{skill_info}{$_}], 298 map [$_, $self->{skill_info}{$_}],
… …
284 if ($ev->{button} == 1) { 307 if ($ev->{button} == 1) {
285 $::CONN->user_send ("ready_skill $name"); 308 $::CONN->user_send ("ready_skill $name");
286 } elsif ($ev->{button} == 2) { 309 } elsif ($ev->{button} == 2) {
287 $::CONN->user_send ("use_skill $name"); 310 $::CONN->user_send ("use_skill $name");
288 } elsif ($ev->{button} == 3) { 311 } elsif ($ev->{button} == 3) {
312 my $shortname = CFPlus::shorten $name, 14;
289 (new CFPlus::UI::Menu 313 (new CFPlus::UI::Menu
290 items => [ 314 items => [
291 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 315 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
292 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 316 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
293 ], 317 ],
294 )->popup ($ev); 318 )->popup ($ev);
295 } else { 319 } else {
296 return 0; 320 return 0;
297 } 321 }
… …
301 325
302 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 326 $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); 327 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 328 $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); 329 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); 330 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
331 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
307 332
308 $x++ and ($x, $y) = (0, $y + 1); 333 $x++ and ($x, $y) = (0, $y + 1);
309 } 334 }
310 } 335 }
311 336
… …
313 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 338 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
314 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 339 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
315 } 340 }
316} 341}
317 342
343sub macro_send {
344 my ($self, $macro) = @_;
345
346 for my $cmd (@{ $macro->{action} }) {
347 $self->send_command ($cmd);
348 }
349}
350
318sub user_send { 351sub user_send {
319 my ($self, $command) = @_; 352 my ($self, $command) = @_;
320 353
354 $self->{record}->($command)
321 if ($self->{record}) { 355 if $self->{record};
322 push @{$self->{record}}, $command;
323 }
324 356
325 $self->logprint ("send: ", $command); 357 $self->logprint ("send: ", $command);
326 $self->send_command ($command); 358 $self->send_command ($command);
327 ::status ($command); 359 ::status ($command);
328} 360}
329 361
330sub start_record { 362sub record {
331 my ($self) = @_; 363 my ($self, $cb) = @_;
332 364
333 $self->{record} = []; 365 $self->{record} = $cb;
334}
335
336sub stop_record {
337 my ($self) = @_;
338 return delete $self->{record};
339} 366}
340 367
341sub map_scroll { 368sub map_scroll {
342 my ($self, $dx, $dy) = @_; 369 my ($self, $dx, $dy) = @_;
343 370
… …
345} 372}
346 373
347sub feed_map1a { 374sub feed_map1a {
348 my ($self, $data) = @_; 375 my ($self, $data) = @_;
349 376
350 $self->{map}->map1a_update ($data); 377 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
351 $self->{map_widget}->update; 378 $self->{map_widget}->update;
352} 379}
353 380
354sub magicmap { 381sub magicmap {
355 my ($self, $w, $h, $x, $y, $data) = @_; 382 my ($self, $w, $h, $x, $y, $data) = @_;
… …
618 [0.75, 0.61, 0.20], 645 [0.75, 0.61, 0.20],
619 [0.99, 0.77, 0.26], 646 [0.99, 0.77, 0.26],
620 [0.74, 0.65, 0.41], 647 [0.74, 0.65, 0.41],
621 ); 648 );
622 649
650 my $fg = $color[$color % @color];
651
623 $self->logprint ("info: ", $text); 652 $self->logprint ("info: ", $text);
624
625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
626 653
627 # try to create single paragraphs of multiple lines sent by the server 654 # try to create single paragraphs of multiple lines sent by the server
628 $text =~ s/(?<=\S)\n(?=\w)/ /g; 655 $text =~ s/(?<=\S)\n(?=\w)/ /g;
629 656
630 $text = CFPlus::asxml $text; 657 $text = CFPlus::asxml $text;
631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 658 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 659 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
633 660
634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 661 ::message ({ fg => $fg, markup => $_ })
635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 662 for split /\n/, $text;
636 $self->{logview}->scroll_to_bottom;
637 663
638 $self->{statusbox}->add ($text, 664 $self->{statusbox}->add ($text,
639 group => $text, 665 group => $text,
640 fg => $color[$color], 666 fg => $fg,
641 timeout => $color >= 2 ? 60 : 10, 667 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 668 tooltip_font => $::FONT_FIXED,
643 ); 669 );
644} 670}
645 671
646sub drawextinfo { 672sub drawextinfo {
… …
655 # try to create single paragraphs out of the multiple lines sent by the server 681 # try to create single paragraphs out of the multiple lines sent by the server
656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 682 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
657 $spell->{message} =~ s/\n+$//; 683 $spell->{message} =~ s/\n+$//;
658 $spell->{message} ||= "Server did not provide a description for this spell."; 684 $spell->{message} ||= "Server did not provide a description for this spell.";
659 685
660 $::SPELL_PAGE->add_spell ($spell); 686 $::SPELL_LIST->add_spell ($spell);
661 687
662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 688 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
663 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 689 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
664} 690}
665 691
666sub spell_delete { 692sub spell_delete {
667 my ($self, $spell) = @_; 693 my ($self, $spell) = @_;
668 694
669 $::SPELL_PAGE->remove_spell ($spell); 695 $::SPELL_LIST->remove_spell ($spell);
696}
697
698sub setup {
699 my ($self, $setup) = @_;
700
701 $self->{map_widget}->set_tilesize ($self->{tilesize});
702 $::MAP->resize ($self->{mapw}, $self->{maph});
670} 703}
671 704
672sub addme_success { 705sub addme_success {
673 my ($self) = @_; 706 my ($self) = @_;
674 707
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; 708 my %skill_help;
679 709
680 for my $head2 ($pom->head1->[3]->head2) { 710 for my $node (CFPlus::Pod::find skill_description => "*") {
681 $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content; 711 my (undef, @par) = CFPlus::Pod::section_of $node;
682 } 712 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684 \%skill_help
685 }; 713 };
686 714
687 for my $skill (values %{$self->{skill_info}}) { 715 for my $skill (values %{$self->{skill_info}}) {
688 $self->{map_widget}->add_command ("ready_skill $skill", 716 $self->{map_widget}->add_command ("ready_skill $skill",
689 (CFPlus::asxml "Ready the skill '$skill'\n\n") 717 (CFPlus::asxml "Ready the skill '$skill'\n\n")
690 . $skill_help->{$skill}); 718 . $skill_help{$skill});
691 $self->{map_widget}->add_command ("use_skill $skill", 719 $self->{map_widget}->add_command ("use_skill $skill",
692 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 720 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693 . $skill_help->{$skill}); 721 . $skill_help{$skill});
694 } 722 }
695} 723}
696 724
697sub eof { 725sub eof {
698 my ($self) = @_; 726 my ($self) = @_;
… …
885 $::SERVER_INFO->set_markup ( 913 $::SERVER_INFO->set_markup (
886 "server <tt>$self->{host}:$self->{port}</tt>\n" 914 "server <tt>$self->{host}:$self->{port}</tt>\n"
887 . "protocol version <tt>$self->{version}</tt>\n" 915 . "protocol version <tt>$self->{version}</tt>\n"
888 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 916 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
889 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 917 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
918 . "editing support $yesno[!!$self->{editor_support}]\n"
919 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
890 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 920 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
891 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 921 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
892 . "map size $self->{mapw}×$self->{maph}\n" 922 . "map size $self->{mapw}×$self->{maph}\n"
893 ); 923 );
924
925 ::setup_build_button ($self->{editor_support}->{builder_ui});
894} 926}
895 927
896sub logged_in { 928sub logged_in {
897 my ($self) = @_; 929 my ($self) = @_;
898 930
899 $self->send_ext_req (cfplus_support => "1", sub { 931 $self->send_ext_req (cfplus_support => version => 1, sub {
900 $self->{cfplus_ext} = $_[0]; 932 $self->{cfplus_ext} = $_[0]{version};
901 $self->update_server_info; 933 $self->update_server_info;
934
935 if ($self->{cfplus_ext} >= 2) {
936 $self->send_ext_req ("editor_support", sub {
937 $self->{editor_support} = $_[0];
938 $self->update_server_info;
939
940 0
941 });
942 }
943
944 0
902 }); 945 });
903 946
904 $self->update_server_info; 947 $self->update_server_info;
905 948
906 $self->send_command ("output-sync $::CFG->{output_sync}"); 949 $self->send_command ("output-sync $::CFG->{output_sync}");
907 $self->send_command ("output-count $::CFG->{output_count}"); 950 $self->send_command ("output-count $::CFG->{output_count}");
951 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
908 $self->send_command ("pickup $::CFG->{pickup}"); 952 $self->send_command ("pickup $::CFG->{pickup}");
953}
954
955sub buildat {
956 my ($self, $builditem, $x, $y) = @_;
957
958 if ($self->{cfplus_ext}) {
959 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
960 }
909} 961}
910 962
911sub lookat { 963sub lookat {
912 my ($self, $x, $y) = @_; 964 my ($self, $x, $y) = @_;
913 965
914 if ($self->{cfplus_ext}) { 966 if ($self->{cfplus_ext}) {
915 $self->send_ext_req (lookat => "$x $y", sub { 967 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
916 my %res = split /\x00/, $_[0]; 968 my ($msg) = @_;
917 969
918 if (exists $res{npc_dialog}) { 970 if (exists $msg->{npc_dialog}) {
919 # start npc chat dialog 971 # start npc chat dialog
920 $self->{npc_dialog} = new CFPlus::NPCDialog:: 972 $self->{npc_dialog} = new CFPlus::NPCDialog::
921 dx => $x, 973 dx => $x,
922 dy => $y, 974 dy => $y,
923 title => "$res{npc_dialog} (NPC)", 975 title => "$msg->{npc_dialog} (NPC)",
924 conn => $self, 976 conn => $self,
925 ; 977 ;
926 } 978 }
927 }); 979 });
928 } 980 }
… …
931} 983}
932 984
933sub destroy { 985sub destroy {
934 my ($self) = @_; 986 my ($self) = @_;
935 987
936 $self->{npc_dialog}->destroy 988 (delete $self->{npc_dialog})->destroy
937 if $self->{npc_dialog}; 989 if $self->{npc_dialog};
938 990
939 $self->SUPER::destroy; 991 $self->SUPER::destroy;
940} 992}
941 993
942package CFPlus::NPCDialog; 994package CFPlus::NPCDialog;
943 995
944our @ISA = 'CFPlus::UI::FancyFrame'; 996our @ISA = 'CFPlus::UI::Toplevel';
945 997
946sub new { 998sub new {
947 my $class = shift; 999 my $class = shift;
948 1000
949 my $self = $class->SUPER::new ( 1001 my $self = $class->SUPER::new (
… …
956 kw => { hi => 0, yes => 0, no => 0 }, 1008 kw => { hi => 0, yes => 0, no => 0 },
957 has_close_button => 1, 1009 has_close_button => 1,
958 @_, 1010 @_,
959 ); 1011 );
960 1012
961 Scalar::Util::weaken (my $this = $self); 1013 CFPlus::weaken (my $this = $self);
962 1014
963 $self->connect (delete => sub { $this->destroy; 1 }); 1015 $self->connect (delete => sub { $this->destroy; 1 });
964 1016
965 # better use a pane... 1017 # better use a pane...
966 $self->add (my $hbox = new CFPlus::UI::HBox); 1018 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
968 1020
969 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1021 $hbox->add (my $vbox = new CFPlus::UI::VBox);
970 1022
971 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1023 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1024 $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" 1025 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 { 1026 on_activate => sub {
979 my ($entry, $text) = @_; 1027 my ($entry, $text) = @_;
980 1028
981 return unless $text =~ /\S/; 1029 return unless $text =~ /\S/;
982 1030
… …
995 on_activate => sub { $this->destroy; 1 }, 1043 on_activate => sub { $this->destroy; 1 },
996 ; 1044 ;
997 1045
998 $self->update_options; 1046 $self->update_options;
999 1047
1000 $self->{token} = $self->{conn}->ext_token; 1048 $self->{id} = $self->{conn}->send_ext_req (
1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1049 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
1002 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1050 sub { $this && $this->feed (@_) }
1051 );
1003 1052
1004 $self->{entry}->grab_focus; 1053 $self->{entry}->grab_focus;
1005 1054
1006 $self->{textview}->add_paragraph ({ 1055 $self->{textview}->add_paragraph ({
1007 fg => [1, 1, 0, 1], 1056 fg => [1, 1, 0, 1],
… …
1013}; 1062};
1014 1063
1015sub update_options { 1064sub update_options {
1016 my ($self) = @_; 1065 my ($self) = @_;
1017 1066
1018 Scalar::Util::weaken $self; 1067 CFPlus::weaken $self;
1019 1068
1020 $self->{options}->clear; 1069 $self->{options}->clear;
1021 $self->{options}->add ($self->{bye_button}); 1070 $self->{options}->add ($self->{bye_button});
1022 1071
1023 for my $kw (sort keys %{ $self->{kw} }) { 1072 for my $kw (sort keys %{ $self->{kw} }) {
… …
1030 ); 1079 );
1031 } 1080 }
1032} 1081}
1033 1082
1034sub feed { 1083sub feed {
1035 my ($self, $data) = @_; 1084 my ($self, $msg) = @_;
1036 1085
1037 Scalar::Util::weaken $self; 1086 CFPlus::weaken $self;
1038 1087
1039 my ($type, $msg) = split / /, $data, 2; 1088 if ($msg->{msgtype} eq "reply") {
1089 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1090 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1040 1091
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; 1092 my $text = "\n" . CFPlus::asxml $msg->{msg};
1049 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1093 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1050 my @link; 1094 my @link;
1051 $msg =~ s{ 1095 $text =~ s{
1052 ($match) 1096 ($match)
1053 }{ 1097 }{
1054 my $kw = $1; 1098 my $kw = $1;
1055 1099
1056 push @link, new CFPlus::UI::Label 1100 push @link, new CFPlus::UI::Label
… …
1061 padding_y => 0, 1105 padding_y => 0,
1062 on_button_up => sub { 1106 on_button_up => sub {
1063 $self->send ($kw); 1107 $self->send ($kw);
1064 }; 1108 };
1065 1109
1066 chr 0xfffc 1110 "\x{fffc}"
1067 }giex; 1111 }giex;
1068 1112
1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1113 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1070 $self->{textview}->scroll_to_bottom; 1114 $self->{textview}->scroll_to_bottom;
1071 $self->update_options; 1115 $self->update_options;
1072 } else { 1116 } else {
1073 $self->destroy; 1117 $self->destroy;
1074 } 1118 }
… …
1080 my ($self, $msg) = @_; 1124 my ($self, $msg) = @_;
1081 1125
1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1126 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083 $self->{textview}->scroll_to_bottom; 1127 $self->{textview}->scroll_to_bottom;
1084 1128
1085 utf8::encode $msg; 1129 $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} 1130}
1088 1131
1089sub destroy { 1132sub destroy {
1090 my ($self) = @_; 1133 my ($self) = @_;
1091 1134
1092 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1135 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1093 1136
1137 if ($self->{conn}) {
1094 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1138 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1095 delete $self->{conn}{npc_dialog}; 1139 delete $self->{conn}{npc_dialog};
1096 $self->{conn}->disconnect_ext ($self->{token}); 1140 $self->{conn}->disconnect_ext ($self->{id});
1141 }
1097 1142
1098 $self->SUPER::destroy; 1143 $self->SUPER::destroy;
1099} 1144}
1100 1145
11011 11461
1147

Diff Legend

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