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.106 by root, Sun Apr 29 20:03:08 2007 UTC vs.
Revision 1.133 by elmex, Tue Jul 24 18:39:39 2007 UTC

… …
21 21
22 my $self = $class->SUPER::new (%arg, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 excmd => 1, 25 excmd => 1,
26 ywidget => 1,#d#
26 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
27 }, 28 },
28 ); 29 );
29 30
30 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
47 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
48 @args 49 @args
49 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
50 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
51 52
53 $self->connect_ext (music => sub {
54 my ($ev) = @_;
55
56 &::audio_music_set ($self->{songs} = $ev->{play})
57 if $ev->{play};
58 });
59
52 $self->connect_ext (event_capabilities => sub { 60 $self->connect_ext (capabilities => sub {
53 my ($cap) = @_; 61 my (%cap) = @_;
54 62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
55 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default; 70 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
60 73
61 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
62 my $h = int $self->{maph} * 32 / $self->{tilesize}; 75 my $h = int $self->{maph} * 32 / $self->{tilesize};
63 76
64 $self->setup_req (mapsize => "${w}x${h}"); 77 $self->setup_req (mapsize => "${w}x${h}");
65 } 78 }
79 }
80 });
81
82 $self->{json_coder}
83 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub {
85 $self->{widget}{$_[0]}
86 });
87
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
94 };
95 });
96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 $::MESSAGE_WINDOW->add_channel ($_[0]);
193 });
194
195 # destroy widgets on logout
196 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
197 for my $ws (values %{delete $self->{widgetset} || {}}) {
198 $_->destroy
199 for values %{delete $ws->{w} || {}};
66 } 200 }
67 }); 201 });
68 202
69 $self->{map_widget}->add_command (@$_) 203 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 204 for @cmd_help;
… …
279 my @skills = keys %{ $self->{skill_info} }; 413 my @skills = keys %{ $self->{skill_info} };
280 414
281 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 415 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
282 $sktbl->clear; 416 $sktbl->clear;
283 417
418 my @add;
419
420 push @add,
284 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 421 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
285 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 422 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
286 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 423 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
287 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 424 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
288 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 425 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
289 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 426 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
427 ;
290 428
291 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 429 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
292 430
293 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 431 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
294 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 432 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
322 } 460 }
323 461
324 1 462 1
325 }; 463 };
326 464
465 push @add,
327 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 466 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
328 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 467 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
329 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 468 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
330 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 469 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
331 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 470 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
332 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 471 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
472 ;
333 473
334 $x++ and ($x, $y) = (0, $y + 1); 474 $x++ and ($x, $y) = (0, $y + 1);
335 } 475 }
476
477 $sktbl->add_at (@add);
336 } 478 }
337 479
338 for (grep exists $stats->{$_}, @skills) { 480 for (grep exists $stats->{$_}, @skills) {
339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 481 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 482 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
577} 719}
578 720
579sub face_find { 721sub face_find {
580 my ($self, $facenum, $face, $cb) = @_; 722 my ($self, $facenum, $face, $cb) = @_;
581 723
582 my $hash = "$face->{chksum},$face->{name}"; 724 if ($face->{type} == 0) { # FT_FACE
583
584 my $id = CFPlus::DB::get_tile_id_sync $hash; 725 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
585 726
586 $face->{id} = $id; 727 $face->{id} = $id;
587 $self->{faceid}[$facenum] = $id; 728 $self->{faceid}[$facenum] = $id;
588 729
589 $self->{map}->set_tileid ($facenum => $id); 730 $self->{map}->set_tileid ($facenum => $id);
590 731
591 CFPlus::DB::get tilecache => $id, $cb; 732 CFPlus::DB::get tilecache => $id, $cb;
733
734 } elsif ($face->{type} & 1) { # with metadata
735 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
736 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
737 }
592} 738}
593 739
594sub face_update { 740sub face_update {
595 my ($self, $facenum, $face, $changed) = @_; 741 my ($self, $facenum, $face, $changed) = @_;
596 742
743 if ($face->{type} == 0) { # FT_FACE
597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 744 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
598 if $changed; 745 if $changed;
599 746
600 $self->set_texture ($face->{id} => delete $face->{image}); 747 $self->set_texture ($face->{id} => delete $face->{data});
748
749 } elsif ($face->{type} & 1) { # split metadata
750 my $cb = sub { };
751
752 if ($face->{type} == 3) { # FT_MUSIC
753 $cb = sub {
754 $self->{music_meta}{$facenum} = $face;
755
756 ::message ({ markup => "downloaded song #$facenum" })
757 if $changed;
758
759 &::audio_music_set ($self->{songs});
760 };
761 }
762
763 if ($changed) { # new data
764 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
765 my $path = CFPlus::DB::path_of_res $face->{name};
766
767 CFPlus::DB::write_file $path, $data, sub {
768 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
769 $face->{meta} = $self->{json_coder}->decode ($meta_json);
770 $face->{path} = $path;
771
772 $cb->();
773 };
774 };
775 } else {
776 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
777 $cb->();
778 }
779 }
601} 780}
602 781
603sub smooth_update { 782sub smooth_update {
604 my ($self, $facenum, $face) = @_; 783 my ($self, $facenum, $face) = @_;
605 784
606 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 785 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
607} 786}
608 787
609sub set_texture { 788sub set_texture {
610 my ($self, $id, $data) = @_; 789 my ($self, $id, $data) = @_;
790
791 return unless $self->{map};
611 792
612 $self->{texture}[$id] = my $tex = 793 $self->{texture}[$id] = my $tex =
613 new_from_image CFPlus::Texture 794 new_from_image CFPlus::Texture
614 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
615 796
616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 797 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
617 $self->{map_widget}->update; 798 $self->{map_widget}->update;
799
800 $_->() for @{(delete $self->{face_cb}{$id}) || []};
801}
802
803sub connect_face_update {
804 my ($self, $id, $cb) = @_;
805
806 push @{$self->{face_cb}{$id}}, $cb;
807
808 CFPlus::guard {
809 @{$self->{face_cb}{$id}}
810 = grep $_ != $cb,
811 @{$self->{face_cb}{$id}};
812 }
618} 813}
619 814
620sub sound_play { 815sub sound_play {
621 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
622 817
… …
630 825
631 $prompt = $LAST_QUERY unless length $prompt; 826 $prompt = $LAST_QUERY unless length $prompt;
632 $LAST_QUERY = $prompt; 827 $LAST_QUERY = $prompt;
633 828
634 $self->{query}-> ($self, $flags, $prompt); 829 $self->{query}-> ($self, $flags, $prompt);
830}
831
832sub sanitise_xml($) {
833 local $_ = shift;
834
835 # we now weed out all tags we do not support
836 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
837 # now all entities
838 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
839
840 # handle some elements
841 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
842 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
843
844 $_
635} 845}
636 846
637our %NAME_TO_COLOR = ( 847our %NAME_TO_COLOR = (
638 black => 0, 848 black => 0,
639 white => 1, 849 white => 1,
… …
667); 877);
668 878
669sub msg { 879sub msg {
670 my ($self, $color, $type, $text, @extra) = @_; 880 my ($self, $color, $type, $text, @extra) = @_;
671 881
882 $text = sanitise_xml $text;
883
672 if (my $cb = $self->{cb_msg}{$type}) { 884 if (my $cb = $self->{cb_msg}{$type}) {
673 $_->($self, $color, $type, $text, @extra) for values %$cb; 885 $_->($self, $color, $type, $text, @extra) for values %$cb;
674 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 886 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
675 $type =~ s/-/_/g; 887 $type =~ s/-/_/g;
676 $self->{$type} = $text; 888 $self->{$type} = $text;
… …
682 894
683 ## try to create single paragraphs of multiple lines sent by the server 895 ## try to create single paragraphs of multiple lines sent by the server
684 # no longer neecssary with TRT servers 896 # no longer neecssary with TRT servers
685 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 897 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
686 898
687 ::message ({ fg => $fg, markup => $_ }) 899 ::message ({ fg => $fg, markup => $_, type => $type })
688 for split /\n/, $text; 900 for split /\n/, $text;
689 901
690 $self->{statusbox}->add ($text, 902 $self->{statusbox}->add ($text,
691 group => $text, 903 group => $text,
692 fg => $fg, 904 fg => $fg,
… …
789 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
790 return unless $::CONN; 1002 return unless $::CONN;
791 1003
792 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
793 1005
1006 my @add;
1007
794 my $row; 1008 my $row;
795 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1009 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
796 if ($row < 6) { 1010 if ($row < 6) {
797 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
798 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
799 CFPlus::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
800 1014
1015 push @add,
801 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
802 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
803 1018
804 $row++; 1019 $row++;
805 } else { 1020 } else {
806 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1021 push @add, 1, $row, new CFPlus::UI::Button
807 text => "More...", 1022 text => "More...",
808 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
809 ); 1024 ;
810 last; 1025 last;
811 } 1026 }
812 } 1027 }
813 if ($::CONN->{open_container}) { 1028 if ($::CONN->{open_container}) {
814 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1029 push @add, 1, $row++, new CFPlus::UI::Button
815 text => "Close container", 1030 text => "Close container",
816 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
817 ); 1032 ;
818 } 1033 }
1034
1035 $::FLOORBOX->add_at (@add);
819 }); 1036 });
820 1037
821 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
822} 1039}
823 1040
… …
949} 1166}
950 1167
951sub logged_in { 1168sub logged_in {
952 my ($self) = @_; 1169 my ($self) = @_;
953 1170
954 $self->send_ext_req (cfplus_support => version => 1, sub { 1171 $self->send_ext_req (cfplus_support => version => 2, sub {
1172 my (%msg) = @_;
1173
955 $self->{cfplus_ext} = $_[0]{version}; 1174 $self->{cfplus_ext} = $msg{version};
956 $self->update_server_info; 1175 $self->update_server_info;
957 1176
958 if ($self->{cfplus_ext} >= 2) { 1177 if ($self->{cfplus_ext} >= 2) {
959 $self->send_ext_req ("editor_support", sub { 1178 $self->send_ext_req ("editor_support", sub {
960 $self->{editor_support} = $_[0]; 1179 $self->{editor_support} = { @_ };
961 $self->update_server_info; 1180 $self->update_server_info;
962 1181
963 0 1182 0
964 }); 1183 });
965 } 1184 }
… …
985 1204
986sub lookat { 1205sub lookat {
987 my ($self, $x, $y) = @_; 1206 my ($self, $x, $y) = @_;
988 1207
989 if ($self->{cfplus_ext}) { 1208 if ($self->{cfplus_ext}) {
990 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1209 $self->send_ext_req (lookat => $x, $y, sub {
991 my ($msg) = @_; 1210 my (%msg) = @_;
992 1211
993 if (exists $msg->{npc_dialog}) { 1212 if (exists $msg{npc_dialog}) {
994 # start npc chat dialog 1213 # start npc chat dialog
995 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1214 $self->{npc_dialog} = new CFPlus::NPCDialog::
996 dx => $x, 1215 token => $msg{npc_dialog},
997 dy => $y,
998 title => "$msg->{npc_dialog} (NPC)", 1216 title => "$msg{npc_dialog}[0] (NPC)",
999 conn => $self, 1217 conn => $self,
1000 ; 1218 ;
1001 } 1219 }
1002 }); 1220 });
1003 } 1221 }
… …
1010 1228
1011 (delete $self->{npc_dialog})->destroy 1229 (delete $self->{npc_dialog})->destroy
1012 if $self->{npc_dialog}; 1230 if $self->{npc_dialog};
1013 1231
1014 $self->SUPER::destroy; 1232 $self->SUPER::destroy;
1233
1234 %$self = ();
1015} 1235}
1016 1236
1017package CFPlus::NPCDialog; 1237package CFPlus::NPCDialog;
1018 1238
1019our @ISA = 'CFPlus::UI::Toplevel'; 1239our @ISA = 'CFPlus::UI::Toplevel';
… …
1066 on_activate => sub { $this->destroy; 1 }, 1286 on_activate => sub { $this->destroy; 1 },
1067 ; 1287 ;
1068 1288
1069 $self->update_options; 1289 $self->update_options;
1070 1290
1071 $self->{id} = $self->{conn}->send_ext_req ( 1291 $self->{id} = "npc-channel-" . $self->{conn}->token;
1072 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1292 $self->{conn}->connect_ext ($self->{id} => sub {
1073 sub { $this && $this->feed (@_) } 1293 $this->feed (@_) if $this;
1074 ); 1294 });
1295
1296 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1075 1297
1076 $self->{entry}->grab_focus; 1298 $self->{entry}->grab_focus;
1077 1299
1078 $self->{textview}->add_paragraph ({ 1300 $self->{textview}->add_paragraph ({
1079 fg => [1, 1, 0, 1], 1301 fg => [1, 1, 0, 1],
… …
1102 ); 1324 );
1103 } 1325 }
1104} 1326}
1105 1327
1106sub feed { 1328sub feed {
1107 my ($self, $msg) = @_; 1329 my ($self, $type, @arg) = @_;
1108 1330
1109 CFPlus::weaken $self; 1331 CFPlus::weaken $self;
1110 1332
1111 if ($msg->{msgtype} eq "reply") { 1333 if ($type eq "update") {
1334 my (%info) = @arg;
1335
1112 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1336 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1113 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1337 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1114
1115 my $text = "\n" . CFPlus::asxml $msg->{msg};
1116 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1117 my @link;
1118 $text =~ s{
1119 ($match)
1120 }{
1121 my $kw = $1;
1122
1123 push @link, new CFPlus::UI::Label
1124 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1125 can_hover => 1,
1126 can_events => 1,
1127 padding_x => 0,
1128 padding_y => 0,
1129 on_button_up => sub {
1130 $self->send ($kw);
1131 };
1132
1133 "\x{fffc}"
1134 }giex;
1135 1338
1339 if (exists $info{msg}) {
1340 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1341 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1342 my @link;
1343 $text =~ s{
1344 ($match)
1345 }{
1346 my $kw = $1;
1347
1348 push @link, new CFPlus::UI::Label
1349 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1350 can_hover => 1,
1351 can_events => 1,
1352 padding_x => 0,
1353 padding_y => 0,
1354 on_button_up => sub {
1355 $self->send ($kw);
1356 };
1357
1358 "\x{fffc}"
1359 }giex;
1360
1136 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1361 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1137 $self->{textview}->scroll_to_bottom; 1362 $self->{textview}->scroll_to_bottom;
1363 }
1364
1138 $self->update_options; 1365 $self->update_options;
1139 } else { 1366 } else {
1140 $self->destroy; 1367 $self->destroy;
1141 } 1368 }
1142 1369
… …
1147 my ($self, $msg) = @_; 1374 my ($self, $msg) = @_;
1148 1375
1149 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1376 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1150 $self->{textview}->scroll_to_bottom; 1377 $self->{textview}->scroll_to_bottom;
1151 1378
1152 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1379 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1153} 1380}
1154 1381
1155sub destroy { 1382sub destroy {
1156 my ($self) = @_; 1383 my ($self) = @_;
1157 1384
1158 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1385 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1159 1386
1160 if ($self->{conn}) { 1387 if ($self->{conn}) {
1161 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1388 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1162 delete $self->{conn}{npc_dialog}; 1389 delete $self->{conn}{npc_dialog};
1163 $self->{conn}->disconnect_ext ($self->{id}); 1390 $self->{conn}->disconnect_ext ($self->{id});
1164 } 1391 }
1165 1392
1166 $self->SUPER::destroy; 1393 $self->SUPER::destroy;

Diff Legend

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