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.110 by root, Tue Jun 26 05:06:01 2007 UTC vs.
Revision 1.130 by root, Tue Jul 24 00:28:07 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 xwidget => 1, 26 ywidget => 1,
27 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
28 }, 28 },
29 ); 29 );
30 30
31 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
48 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
49 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
52 52
53 $self->connect_ext (music => sub {
54 my (%ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 });
106
53 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (capabilities => sub {
54 my ($cap) = @_; 108 my (%cap) = @_;
55 109
56 if (my $ts = $cap->{tileset}) { 110 if (my $ts = $cap{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) { 111 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default; 112 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3]; 113 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]); 114 $self->setup_req (tileset => $default->[0]);
61 115
… …
65 $self->setup_req (mapsize => "${w}x${h}"); 119 $self->setup_req (mapsize => "${w}x${h}");
66 } 120 }
67 } 121 }
68 }); 122 });
69 123
124 $self->{json_coder}
125 ->convert_blessed
126 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]}
128 });
129
130 # widgetset new
70 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
71 my ($arg) = @_; 132 my ($id) = @_;
72 133
73 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$id} = {
74 w => {}, 135 w => {},
75 }; 136 };
76 }); 137 });
77 138
139 # widgetset destroy
78 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
79 my ($arg) = @_; 141 my ($id) = @_;
80 142
81 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$id}
82 or return; 144 or return;
83 145
84 $_->destroy 146 $_->destroy
85 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
86 }); 148 });
87 149
150 # widgetset create
88 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
89 my ($arg) = @_; 152 my ($ws, $id, $class, $args) = @_;
90
91 my $args = $arg->{args} || {};
92 153
93 for my $ev (grep /^on_/, keys %$args) { 154 for my $ev (grep /^on_/, keys %$args) {
94 $args->{$ev} = sub { 155 $args->{$ev} = sub {
95 my $id = shift->{s_id}; 156 my $id = shift->{s_id};
96 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 157 $self->send_exti_msg (w_e => $id, $ev, \@_);
97 158
98 1 159 1
99 }; 160 };
100 } 161 }
101 162
102 if (my $widget = eval { 163 if (my $widget = eval {
103 local $SIG{__DIE__}; 164 local $SIG{__DIE__};
104 "CFPlus::UI::$arg->{class}"->new ( 165 "CFPlus::UI::$class"->new (
105 %$args, 166 %$args,
106 s_ws => $arg->{ws}, 167 s_ws => $ws,
107 s_id => $arg->{id}, 168 s_id => $id,
108 ) 169 )
109 } 170 }
110 ) { 171 ) {
111 $self->{widget}{$arg->{id}} 172 $self->{widget}{$id}
112 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 173 = $self->{widgetset}{$ws}{w}{$id}
113 = $widget; 174 = $widget;
114 175
115 $widget->connect (on_destroy => sub { 176 $widget->connect (on_destroy => sub {
116 my ($widget) = @_; 177 my ($widget) = @_;
117 178
118 delete $self->{widget}{$widget->{s_id}}; 179 delete $self->{widget}{$widget->{s_id}};
119 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 180 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
120 }); 181 });
121 } else { 182 } else {
122 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 183 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
123 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 184 $self->send_exti_msg (w_e => $id, "destroy");
124 } 185 }
125 }); 186 });
126 187
188 # widget call
127 $self->connect_ext (w_c => sub { 189 $self->connect_ext (w_c => sub {
128 my ($arg) = @_; 190 my ($id, $rid, $method, $args) = @_;
129 191
130 my $w = $self->{widget}{$arg->{id}} 192 my $w = $self->{widget}{$id}
131 or return; 193 or return;
132 my $m = $arg->{name};
133 194
134 my @a = map { 195 $args ||= [];
135 "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
136 ? $self->{widget}{$_->{__widget_ref__}}
137 : $_
138 } @{ $arg->{args} || [] };
139 196
140 if (exists $arg->{rid}) { 197 if ($rid) {
141 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]); 198 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
142 } else { 199 } else {
143 $w->$m (@a); 200 $w->$method (@$args);
144 } 201 }
145 }); 202 });
146 203
204 # widget set
147 $self->connect_ext (w_s => sub { 205 $self->connect_ext (w_s => sub {
148 my ($arg) = @_; 206 my ($id, $attr) = @_;
149 207
150 my $w = $self->{widget}{$arg->{id}} 208 my $w = $self->{widget}{$id}
151 or return; 209 or return;
152 210
153 $w->{$arg->{name}} = $arg->{value}; 211 for (my $i = 0; $i < $#$attr; $i += 2) {
212 my ($member, $value) = @$attr[$i, $i+1];
213 if (defined $value) {
214 $w->{$member} = $value;
215 } else {
216 delete $w->{$member};
217 }
218 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
219 }
154 }); 220 });
155 221
222 # widget get
156 $self->connect_ext (w_g => sub { 223 $self->connect_ext (w_g => sub {
157 my ($arg) = @_; 224 my ($id, $rid, $attr) = @_;
158 225
159 my $w = $self->{widget}{$arg->{id}} 226 my $w = $self->{widget}{$id}
160 or return; 227 or return;
161 228
162 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 229 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
163 }); 230 });
164 231
232 # destroy widgets on logout
165 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 233 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
166 for my $ws (values %{delete $self->{widgetset} || {}}) { 234 for my $ws (values %{delete $self->{widgetset} || {}}) {
167 $_->destroy 235 $_->destroy
168 for values %{delete $ws->{w} || {}}; 236 for values %{delete $ws->{w} || {}};
169 } 237 }
… …
382 my @skills = keys %{ $self->{skill_info} }; 450 my @skills = keys %{ $self->{skill_info} };
383 451
384 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 452 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
385 $sktbl->clear; 453 $sktbl->clear;
386 454
455 my @add;
456
457 push @add,
387 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 458 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
388 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 459 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
389 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 460 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
390 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 461 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
391 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 462 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
392 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 463 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
464 ;
393 465
394 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 466 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
395 467
396 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 468 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
397 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 469 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
425 } 497 }
426 498
427 1 499 1
428 }; 500 };
429 501
502 push @add,
430 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 503 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
431 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 504 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
432 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 505 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
433 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 506 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
434 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 507 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
435 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 508 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
509 ;
436 510
437 $x++ and ($x, $y) = (0, $y + 1); 511 $x++ and ($x, $y) = (0, $y + 1);
438 } 512 }
513
514 $sktbl->add_at (@add);
439 } 515 }
440 516
441 for (grep exists $stats->{$_}, @skills) { 517 for (grep exists $stats->{$_}, @skills) {
442 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 518 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
443 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 519 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
710} 786}
711 787
712sub set_texture { 788sub set_texture {
713 my ($self, $id, $data) = @_; 789 my ($self, $id, $data) = @_;
714 790
791 return unless $self->{map};
792
715 $self->{texture}[$id] = my $tex = 793 $self->{texture}[$id] = my $tex =
716 new_from_image CFPlus::Texture 794 new_from_image CFPlus::Texture
717 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
718 796
719 $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}});
720 $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 }
721} 813}
722 814
723sub sound_play { 815sub sound_play {
724 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
725 817
… …
909 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
910 return unless $::CONN; 1002 return unless $::CONN;
911 1003
912 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
913 1005
1006 my @add;
1007
914 my $row; 1008 my $row;
915 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} }) {
916 if ($row < 6) { 1010 if ($row < 6) {
917 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
918 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
919 CFPlus::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
920 1014
1015 push @add,
921 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
922 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
923 1018
924 $row++; 1019 $row++;
925 } else { 1020 } else {
926 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1021 push @add, 1, $row, new CFPlus::UI::Button
927 text => "More...", 1022 text => "More...",
928 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
929 ); 1024 ;
930 last; 1025 last;
931 } 1026 }
932 } 1027 }
933 if ($::CONN->{open_container}) { 1028 if ($::CONN->{open_container}) {
934 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1029 push @add, 1, $row++, new CFPlus::UI::Button
935 text => "Close container", 1030 text => "Close container",
936 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
937 ); 1032 ;
938 } 1033 }
1034
1035 $::FLOORBOX->add_at (@add);
939 }); 1036 });
940 1037
941 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
942} 1039}
943 1040
… …
1069} 1166}
1070 1167
1071sub logged_in { 1168sub logged_in {
1072 my ($self) = @_; 1169 my ($self) = @_;
1073 1170
1074 $self->send_ext_req (cfplus_support => version => 1, sub { 1171 $self->send_ext_req (cfplus_support => version => 2, sub {
1172 my (%msg) = @_;
1173
1075 $self->{cfplus_ext} = $_[0]{version}; 1174 $self->{cfplus_ext} = $msg{version};
1076 $self->update_server_info; 1175 $self->update_server_info;
1077 1176
1078 if ($self->{cfplus_ext} >= 2) { 1177 if ($self->{cfplus_ext} >= 2) {
1079 $self->send_ext_req ("editor_support", sub { 1178 $self->send_ext_req ("editor_support", sub {
1080 $self->{editor_support} = $_[0]; 1179 $self->{editor_support} = { @_ };
1081 $self->update_server_info; 1180 $self->update_server_info;
1082 1181
1083 0 1182 0
1084 }); 1183 });
1085 } 1184 }
… …
1105 1204
1106sub lookat { 1205sub lookat {
1107 my ($self, $x, $y) = @_; 1206 my ($self, $x, $y) = @_;
1108 1207
1109 if ($self->{cfplus_ext}) { 1208 if ($self->{cfplus_ext}) {
1110 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1209 $self->send_ext_req (lookat => $x, $y, sub {
1111 my ($msg) = @_; 1210 my (%msg) = @_;
1112 1211
1113 if (exists $msg->{npc_dialog}) { 1212 if (exists $msg{npc_dialog}) {
1114 # start npc chat dialog 1213 # start npc chat dialog
1115 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1214 $self->{npc_dialog} = new CFPlus::NPCDialog::
1116 dx => $x, 1215 token => $msg{npc_dialog},
1117 dy => $y,
1118 title => "$msg->{npc_dialog} (NPC)", 1216 title => "$msg{npc_dialog}[0] (NPC)",
1119 conn => $self, 1217 conn => $self,
1120 ; 1218 ;
1121 } 1219 }
1122 }); 1220 });
1123 } 1221 }
… …
1130 1228
1131 (delete $self->{npc_dialog})->destroy 1229 (delete $self->{npc_dialog})->destroy
1132 if $self->{npc_dialog}; 1230 if $self->{npc_dialog};
1133 1231
1134 $self->SUPER::destroy; 1232 $self->SUPER::destroy;
1233
1234 %$self = ();
1135} 1235}
1136 1236
1137package CFPlus::NPCDialog; 1237package CFPlus::NPCDialog;
1138 1238
1139our @ISA = 'CFPlus::UI::Toplevel'; 1239our @ISA = 'CFPlus::UI::Toplevel';
… …
1186 on_activate => sub { $this->destroy; 1 }, 1286 on_activate => sub { $this->destroy; 1 },
1187 ; 1287 ;
1188 1288
1189 $self->update_options; 1289 $self->update_options;
1190 1290
1191 $self->{id} = $self->{conn}->send_ext_req ( 1291 $self->{id} = "npc-channel-" . $self->{conn}->token;
1192 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1292 $self->{conn}->connect_ext ($self->{id} => sub {
1193 sub { $this && $this->feed (@_) } 1293 $this->feed (@_) if $this;
1194 ); 1294 });
1295
1296 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1195 1297
1196 $self->{entry}->grab_focus; 1298 $self->{entry}->grab_focus;
1197 1299
1198 $self->{textview}->add_paragraph ({ 1300 $self->{textview}->add_paragraph ({
1199 fg => [1, 1, 0, 1], 1301 fg => [1, 1, 0, 1],
… …
1222 ); 1324 );
1223 } 1325 }
1224} 1326}
1225 1327
1226sub feed { 1328sub feed {
1227 my ($self, $msg) = @_; 1329 my ($self, $type, @arg) = @_;
1228 1330
1229 CFPlus::weaken $self; 1331 CFPlus::weaken $self;
1230 1332
1231 if ($msg->{msgtype} eq "reply") { 1333 if ($type eq "update") {
1334 my (%info) = @arg;
1335
1232 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1336 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1233 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1337 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1234
1235 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1236 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1237 my @link;
1238 $text =~ s{
1239 ($match)
1240 }{
1241 my $kw = $1;
1242
1243 push @link, new CFPlus::UI::Label
1244 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1245 can_hover => 1,
1246 can_events => 1,
1247 padding_x => 0,
1248 padding_y => 0,
1249 on_button_up => sub {
1250 $self->send ($kw);
1251 };
1252
1253 "\x{fffc}"
1254 }giex;
1255 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
1256 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1361 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1257 $self->{textview}->scroll_to_bottom; 1362 $self->{textview}->scroll_to_bottom;
1363 }
1364
1258 $self->update_options; 1365 $self->update_options;
1259 } else { 1366 } else {
1260 $self->destroy; 1367 $self->destroy;
1261 } 1368 }
1262 1369
… …
1267 my ($self, $msg) = @_; 1374 my ($self, $msg) = @_;
1268 1375
1269 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1376 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1270 $self->{textview}->scroll_to_bottom; 1377 $self->{textview}->scroll_to_bottom;
1271 1378
1272 $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);
1273} 1380}
1274 1381
1275sub destroy { 1382sub destroy {
1276 my ($self) = @_; 1383 my ($self) = @_;
1277 1384
1278 #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
1279 1386
1280 if ($self->{conn}) { 1387 if ($self->{conn}) {
1281 $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};
1282 delete $self->{conn}{npc_dialog}; 1389 delete $self->{conn}{npc_dialog};
1283 $self->{conn}->disconnect_ext ($self->{id}); 1390 $self->{conn}->disconnect_ext ($self->{id});
1284 } 1391 }
1285 1392
1286 $self->SUPER::destroy; 1393 $self->SUPER::destroy;

Diff Legend

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