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

Diff Legend

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