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.124 by root, Fri Jul 20 16:32:04 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB;
9use CFPlus::UI; 10use CFPlus::UI;
10use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
11 16
12use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
13 18
14sub new { 19sub new {
15 my $class = shift; 20 my ($class, %arg) = @_;
16 21
17 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,
27 %{$arg{setup_req} || {}},
28 },
29 );
18 30
19 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
20 32
21 my $cmd_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub { 33 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 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
28 or next; 35 or die "unparseable command help: $_->{kw}[0]";
29 36
30 my $cmd = $1; 37 my $cmd = $1;
31 my @args = split /\|/, $2; 38 my @args = split /\|/, $2;
32 @args = (".*") unless @args; 39 @args = (".*") unless @args;
33 40
41 my (undef, @par) = CFPlus::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par;
43
34 $_ = $_ eq ".*" ? "" : " $_" 44 $_ = $_ eq ".*" ? "" : " $_"
35 for @args; 45 for @args;
36 46
37 my $text = CFPlus::Pod::as_markup $head2->content; 47 map ["$cmd$_", $text],
38
39 push @cmd_help, ["$cmd$_", $text]
40 for sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
49 @args
50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*";
52
53 $self->connect_ext (event_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 };
41 @args; 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
107 $self->connect_ext (event_capabilities => sub {
108 my ($cap) = @_;
109
110 if (my $ts = $cap->{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]);
115
116 my $w = int $self->{mapw} * 32 / $self->{tilesize};
117 my $h = int $self->{maph} * 32 / $self->{tilesize};
118
119 $self->setup_req (mapsize => "${w}x${h}");
120 }
121 }
122 });
123
124 $self->{json_coder}
125 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub {
127 $self->{widget}{$_[0]}
128 });
129
130 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_;
133
134 $self->{widgetset}{$arg{id}} = {
135 w => {},
42 } 136 };
43
44 \@cmd_help
45 }; 137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_;
142
143 my $ws = delete $self->{widgetset}{$arg{id}}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset destroy
151 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_;
153
154 my $args = $arg->{args} || {};
155
156 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub {
158 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
160
161 1
162 };
163 }
164
165 if (my $widget = eval {
166 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new (
168 %$args,
169 s_ws => $arg->{ws},
170 s_id => $arg->{id},
171 )
172 }
173 ) {
174 $self->{widget}{$arg->{id}}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176 = $widget;
177
178 $widget->connect (on_destroy => sub {
179 my ($widget) = @_;
180
181 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 });
184 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
187 }
188 });
189
190 # widget call
191 $self->connect_ext (w_c => sub {
192 my ($arg) = @_;
193
194 my $w = $self->{widget}{$arg->{id}}
195 or return;
196 my $m = $arg->{name};
197
198 my $a = $arg->{args} || [];
199
200 if (exists $arg->{rid}) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
202 } else {
203 $w->$m (@$a);
204 }
205 });
206
207 # widget set
208 $self->connect_ext (w_s => sub {
209 my ($arg) = @_;
210
211 my $w = $self->{widget}{$arg->{id}}
212 or return;
213
214 $w->{$arg->{name}} = $arg->{value};
215 });
216
217 # widget get
218 $self->connect_ext (w_g => sub {
219 my ($arg) = @_;
220
221 my $w = $self->{widget}{$arg->{id}}
222 or return;
223
224 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
225 });
226
227 # destroy widgets on logout
228 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
229 for my $ws (values %{delete $self->{widgetset} || {}}) {
230 $_->destroy
231 for values %{delete $ws->{w} || {}};
232 }
233 });
46 234
47 $self->{map_widget}->add_command (@$_) 235 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 236 for @cmd_help;
49 237
238 {
239 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
240 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
241 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
242 }
243
244 {
50 $self->{noface} = new_from_file CFPlus::Texture 245 $self->{noface} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 246 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
247 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
248 }
52 249
53 $self->{open_container} = 0; 250 $self->{open_container} = 0;
54 251
55 # "global"
56 $self->{tilecache} = CFPlus::db_table "tilecache";
57 $self->{facemap} = CFPlus::db_table "facemap";
58
59 # per server 252 # per server
60 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 253 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
61 254
62 $self 255 $self
63} 256}
64 257
65sub logprint { 258sub logprint {
… …
222 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 415 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
223 $::GAUGES->{food} ->set_value ($fo, $fo_m); 416 $::GAUGES->{food} ->set_value ($fo, $fo_m);
224 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 417 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
225 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 418 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
226 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 419 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
227 my $rng = $stats->{+CS_STAT_RANGE}; 420 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
228 $rng =~ s/^Range: //; # thank you so much dear server
229 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
230 my $title = $stats->{+CS_STAT_TITLE}; 421 my $title = $stats->{+CS_STAT_TITLE};
231 $title =~ s/^Player: //; 422 $title =~ s/^Player: //;
232 $::STATWIDS->{title} ->set_text ("Title: " . $title); 423 $::STATWIDS->{title} ->set_text ("Title: " . $title);
233 424
234 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 425 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
254 my @skills = keys %{ $self->{skill_info} }; 445 my @skills = keys %{ $self->{skill_info} };
255 446
256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 447 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
257 $sktbl->clear; 448 $sktbl->clear;
258 449
450 my @add;
451
452 push @add,
259 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 453 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
260 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 454 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
261 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 455 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
262 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 456 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
263 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 457 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
264 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 458 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
459 ;
265 460
266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 461 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267 462
268 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 463 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); 464 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 465
272 my ($x, $y) = (0, 1); 466 my ($x, $y) = (0, 1);
273 for ( 467 for (
274 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 468 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
275 map [$_, $self->{skill_info}{$_}], 469 map [$_, $self->{skill_info}{$_}],
… …
284 if ($ev->{button} == 1) { 478 if ($ev->{button} == 1) {
285 $::CONN->user_send ("ready_skill $name"); 479 $::CONN->user_send ("ready_skill $name");
286 } elsif ($ev->{button} == 2) { 480 } elsif ($ev->{button} == 2) {
287 $::CONN->user_send ("use_skill $name"); 481 $::CONN->user_send ("use_skill $name");
288 } elsif ($ev->{button} == 3) { 482 } elsif ($ev->{button} == 3) {
483 my $shortname = CFPlus::shorten $name, 14;
289 (new CFPlus::UI::Menu 484 (new CFPlus::UI::Menu
290 items => [ 485 items => [
291 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 486 ["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"]) }], 487 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
293 ], 488 ],
294 )->popup ($ev); 489 )->popup ($ev);
295 } else { 490 } else {
296 return 0; 491 return 0;
297 } 492 }
298 493
299 1 494 1
300 }; 495 };
301 496
497 push @add,
302 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 498 $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); 499 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 500 $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); 501 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); 502 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
503 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
504 ;
307 505
308 $x++ and ($x, $y) = (0, $y + 1); 506 $x++ and ($x, $y) = (0, $y + 1);
309 } 507 }
508
509 $sktbl->add_at (@add);
310 } 510 }
311 511
312 for (grep exists $stats->{$_}, @skills) { 512 for (grep exists $stats->{$_}, @skills) {
313 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 513 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
314 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 514 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
315 } 515 }
316} 516}
317 517
518sub macro_send {
519 my ($self, $macro) = @_;
520
521 for my $cmd (@{ $macro->{action} }) {
522 $self->send_command ($cmd);
523 }
524}
525
318sub user_send { 526sub user_send {
319 my ($self, $command) = @_; 527 my ($self, $command) = @_;
320 528
529 $self->{record}->($command)
321 if ($self->{record}) { 530 if $self->{record};
322 push @{$self->{record}}, $command;
323 }
324 531
325 $self->logprint ("send: ", $command); 532 $self->logprint ("send: ", $command);
326 $self->send_command ($command); 533 $self->send_command ($command);
327 ::status ($command); 534 ::status ($command);
328} 535}
329 536
330sub start_record { 537sub record {
331 my ($self) = @_; 538 my ($self, $cb) = @_;
332 539
333 $self->{record} = []; 540 $self->{record} = $cb;
334}
335
336sub stop_record {
337 my ($self) = @_;
338 return delete $self->{record};
339} 541}
340 542
341sub map_scroll { 543sub map_scroll {
342 my ($self, $dx, $dy) = @_; 544 my ($self, $dx, $dy) = @_;
343 545
… …
345} 547}
346 548
347sub feed_map1a { 549sub feed_map1a {
348 my ($self, $data) = @_; 550 my ($self, $data) = @_;
349 551
350 $self->{map}->map1a_update ($data); 552 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
351 $self->{map_widget}->update; 553 $self->{map_widget}->update;
352} 554}
353 555
354sub magicmap { 556sub magicmap {
355 my ($self, $w, $h, $x, $y, $data) = @_; 557 my ($self, $w, $h, $x, $y, $data) = @_;
… …
364 or return; 566 or return;
365 567
366 my ($hash, $x, $y, $w, $h) = @$map_info; 568 my ($hash, $x, $y, $w, $h) = @$map_info;
367 569
368 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 570 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
369 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 571 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
370 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 572 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
371} 573}
372 574
373sub map_clear { 575sub map_clear {
374 my ($self) = @_; 576 my ($self) = @_;
… …
378 580
379 $self->{map}->clear; 581 $self->{map}->clear;
380 delete $self->{map_widget}{magicmap}; 582 delete $self->{map_widget}{magicmap};
381} 583}
382 584
585sub bg_fetch {
586 my ($self) = @_;
587
588 my $id;
589
590 do {
591 $id = pop @{$self->{bg_fetch}}
592 or return;
593 } while $self->{texture}[$id];
594
595 CFPlus::DB::get tilecache => $id, sub {
596 my ($data) = @_;
597
598 return unless $self->{map}; # stop when destroyed
599
600 $self->set_texture ($id => $data)
601 if defined $data;
602
603 $self->bg_fetch;
604 };
605}
383 606
384sub load_map($$$) { 607sub load_map($$$) {
385 my ($self, $hash, $x, $y) = @_; 608 my ($self, $hash, $x, $y) = @_;
386 609
387 if (defined (my $data = $self->{mapcache}->get ($hash))) { 610 my $gen = $self->{map_change_gen};
611
612 CFPlus::DB::get $self->{mapcache} => $hash, sub {
613 return unless $gen == $self->{map_change_gen};
614
615 my ($data) = @_;
616
617 if (defined $data) {
388 $data = Compress::LZF::decompress $data; 618 $data = Compress::LZF::decompress $data;
389 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 619 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
390 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
391 my $data = $self->{tilecache}->get ($id)
392 or next;
393 620
394 $self->set_texture ($id => $data); 621 my $inprogress = @{ $self->{bg_fetch} || [] };
622 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
623 $self->bg_fetch unless $inprogress;
395 } 624 }
396 } 625 };
397} 626}
398 627
399# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 628# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
400# (server resource,s latency, bandwidth), so this hack is warranted. 629# (server resource,s latency, bandwidth), so this hack is warranted.
401# the right fix is to make real tiled maps with an overview file 630# the right fix is to make real tiled maps with an overview file
… …
465 694
466 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 695 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
467 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 696 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
468 697
469 } else { 698 } else {
699 my $gen = $self->{map_change_gen};
470 $self->send_mapinfo ("spatial $path$tile", sub { 700 $self->send_mapinfo ("spatial $path$tile", sub {
701 return unless $gen == $self->{map_change_gen};
702
471 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 703 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
472 704
473 return if $mode ne "spatial"; 705 return if $mode ne "spatial";
474 706
475 $x += $self->{map}->ox; 707 $x += $self->{map}->ox;
… …
489 721
490sub map_change { 722sub map_change {
491 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 723 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
492 724
493 $self->flush_map; 725 $self->flush_map;
726
727 ++$self->{map_change_gen};
494 728
495 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 729 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
496 730
497 my $mapmapw = $self->{mapmap}->{w}; 731 my $mapmapw = $self->{mapmap}->{w};
498 my $mapmaph = $self->{mapmap}->{h}; 732 my $mapmaph = $self->{mapmap}->{h};
… …
515 $self->load_map ($hash, $x, $y); 749 $self->load_map ($hash, $x, $y);
516 $self->flood_fill (0, 0, 0, "", $hash, $flags); 750 $self->flood_fill (0, 0, 0, "", $hash, $flags);
517} 751}
518 752
519sub face_find { 753sub face_find {
520 my ($self, $facenum, $face) = @_; 754 my ($self, $facenum, $face, $cb) = @_;
521 755
522 my $hash = "$face->{chksum},$face->{name}"; 756 my $hash = "$face->{chksum},$face->{name}";
523 757
524 my $id = $self->{facemap}->get ($hash); 758 my $id = CFPlus::DB::get_tile_id_sync $hash;
525 759
526 unless ($id) {
527 # create new id for face
528 # I love transactions
529 for (1..100) {
530 my $txn = $CFPlus::DB_ENV->txn_begin;
531 my $status = $self->{facemap}->db_get (id => $id);
532 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
533 $id = ($id || 64) + 1;
534 if ($self->{facemap}->put (id => $id) == 0
535 && $self->{facemap}->put ($hash => $id) == 0) {
536 $txn->txn_commit;
537
538 goto gotid;
539 }
540 }
541 $txn->txn_abort;
542 }
543
544 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
545 }
546
547gotid:
548 $face->{id} = $id; 760 $face->{id} = $id;
549 $self->{map}->set_face ($facenum => $id);
550 $self->{faceid}[$facenum] = $id;#d# 761 $self->{faceid}[$facenum] = $id;
551 762
552 my $face = $self->{tilecache}->get ($id); 763 $self->{map}->set_tileid ($facenum => $id);
553 764
554 if ($face) { 765 CFPlus::DB::get tilecache => $id, $cb;
555 #$self->face_prefetch;
556 $face
557 } else {
558 my $tex = $self->{noface};
559 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
560 undef
561 };
562} 766}
563 767
564sub face_update { 768sub face_update {
565 my ($self, $facenum, $face, $changed) = @_; 769 my ($self, $facenum, $face, $changed) = @_;
566 770
567 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 771 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
772 if $changed;
568 773
569 $self->set_texture ($face->{id} => delete $face->{image}); 774 $self->set_texture ($face->{id} => delete $face->{image});
775}
776
777sub smooth_update {
778 my ($self, $facenum, $face) = @_;
779
780 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
570} 781}
571 782
572sub set_texture { 783sub set_texture {
573 my ($self, $id, $data) = @_; 784 my ($self, $id, $data) = @_;
574 785
786 return unless $self->{map};
787
575 $self->{texture}[$id] ||= do { 788 $self->{texture}[$id] = my $tex =
576 my $tex =
577 new_from_image CFPlus::Texture 789 new_from_image CFPlus::Texture
578 $data, minify => 1, mipmap => 1; 790 $data, minify => 1, mipmap => 1;
579 791
580 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 792 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
581 $self->{map_widget}->update; 793 $self->{map_widget}->update;
582 794
583 $tex 795 $_->() for @{(delete $self->{face_cb}{$id}) || []};
796}
797
798sub connect_face_update {
799 my ($self, $id, $cb) = @_;
800
801 push @{$self->{face_cb}{$id}}, $cb;
802
803 CFPlus::guard {
804 @{$self->{face_cb}{$id}}
805 = grep $_ != $cb,
806 @{$self->{face_cb}{$id}};
584 }; 807 }
585} 808}
586 809
587sub sound_play { 810sub sound_play {
588 my ($self, $x, $y, $soundnum, $type) = @_; 811 my ($self, $x, $y, $soundnum, $type) = @_;
589 812
… …
599 $LAST_QUERY = $prompt; 822 $LAST_QUERY = $prompt;
600 823
601 $self->{query}-> ($self, $flags, $prompt); 824 $self->{query}-> ($self, $flags, $prompt);
602} 825}
603 826
604sub drawinfo { 827sub sanitise_xml($) {
605 my ($self, $color, $text) = @_; 828 local $_ = shift;
606 829
607 my @color = ( 830 # we now weed out all tags we do not support
831 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
832 # now all entities
833 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
834
835 # handle some elements
836 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
837 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
838
839 $_
840}
841
842our %NAME_TO_COLOR = (
843 black => 0,
844 white => 1,
845 darkblue => 2,
846 red => 3,
847 orange => 4,
848 lightblue => 5,
849 darkorange => 6,
850 green => 7,
851 darkgreen => 8,
852 grey => 9,
853 brown => 10,
854 yellow => 11,
855 tan => 12,
856);
857
858our @CF_COLOR = (
608 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 859 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
609 [1.00, 1.00, 1.00], 860 [1.00, 1.00, 1.00],
610 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 861 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
611 [1.00, 0.00, 0.00], 862 [1.00, 0.00, 0.00],
612 [1.00, 0.54, 0.00], 863 [1.00, 0.54, 0.00],
613 [0.11, 0.56, 1.00], 864 [0.11, 0.56, 1.00],
614 [0.93, 0.46, 0.00], 865 [0.93, 0.46, 0.00],
615 [0.18, 0.54, 0.34], 866 [0.18, 0.54, 0.34],
616 [0.56, 0.73, 0.56], 867 [0.56, 0.73, 0.56],
617 [0.80, 0.80, 0.80], 868 [0.80, 0.80, 0.80],
618 [0.75, 0.61, 0.20], 869 [0.75, 0.61, 0.20],
619 [0.99, 0.77, 0.26], 870 [0.99, 0.77, 0.26],
620 [0.74, 0.65, 0.41], 871 [0.74, 0.65, 0.41],
621 ); 872);
622 873
874sub msg {
875 my ($self, $color, $type, $text, @extra) = @_;
876
877 $text = sanitise_xml $text;
878
879 if (my $cb = $self->{cb_msg}{$type}) {
880 $_->($self, $color, $type, $text, @extra) for values %$cb;
881 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
882 $type =~ s/-/_/g;
883 $self->{$type} = $text;
884 } else {
623 $self->logprint ("info: ", $text); 885 $self->logprint ("msg: ", $text);
886 return if $color < 0; # negative color == ignore if not understood
624 887
625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 888 my $fg = $CF_COLOR[$color % @CF_COLOR];
626 889
627 # try to create single paragraphs of multiple lines sent by the server 890 ## try to create single paragraphs of multiple lines sent by the server
891 # no longer neecssary with TRT servers
628 $text =~ s/(?<=\S)\n(?=\w)/ /g; 892 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
629 893
630 $text = CFPlus::asxml $text; 894 ::message ({ fg => $fg, markup => $_ })
631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 895 for split /\n/, $text;
632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
633 896
634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
636 $self->{logview}->scroll_to_bottom;
637
638 $self->{statusbox}->add ($text, 897 $self->{statusbox}->add ($text,
639 group => $text, 898 group => $text,
640 fg => $color[$color], 899 fg => $fg,
641 timeout => $color >= 2 ? 60 : 10, 900 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 901 tooltip_font => $::FONT_FIXED,
643 ); 902 );
644} 903 }
645
646sub drawextinfo {
647 my ($self, $color, $type, $subtype, $message) = @_;
648
649 $self->drawinfo ($color, $message);
650} 904}
651 905
652sub spell_add { 906sub spell_add {
653 my ($self, $spell) = @_; 907 my ($self, $spell) = @_;
654 908
655 # try to create single paragraphs out of the multiple lines sent by the server 909 # try to create single paragraphs out of the multiple lines sent by the server
656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 910 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
657 $spell->{message} =~ s/\n+$//; 911 $spell->{message} =~ s/\n+$//;
658 $spell->{message} ||= "Server did not provide a description for this spell."; 912 $spell->{message} ||= "Server did not provide a description for this spell.";
659 913
660 $::SPELL_PAGE->add_spell ($spell); 914 $::SPELL_LIST->add_spell ($spell);
661 915
662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 916 $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}); 917 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
664} 918}
665 919
666sub spell_delete { 920sub spell_delete {
667 my ($self, $spell) = @_; 921 my ($self, $spell) = @_;
668 922
669 $::SPELL_PAGE->remove_spell ($spell); 923 $::SPELL_LIST->remove_spell ($spell);
924}
925
926sub setup {
927 my ($self, $setup) = @_;
928
929 $self->{map_widget}->set_tilesize ($self->{tilesize});
930 $::MAP->resize ($self->{mapw}, $self->{maph});
670} 931}
671 932
672sub addme_success { 933sub addme_success {
673 my ($self) = @_; 934 my ($self) = @_;
674 935
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; 936 my %skill_help;
679 937
680 for my $head2 ($pom->head1->[3]->head2) { 938 for my $node (CFPlus::Pod::find skill_description => "*") {
681 $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content; 939 my (undef, @par) = CFPlus::Pod::section_of $node;
682 } 940 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684 \%skill_help
685 }; 941 };
686 942
687 for my $skill (values %{$self->{skill_info}}) { 943 for my $skill (values %{$self->{skill_info}}) {
688 $self->{map_widget}->add_command ("ready_skill $skill", 944 $self->{map_widget}->add_command ("ready_skill $skill",
689 (CFPlus::asxml "Ready the skill '$skill'\n\n") 945 (CFPlus::asxml "Ready the skill '$skill'\n\n")
690 . $skill_help->{$skill}); 946 . $skill_help{$skill});
691 $self->{map_widget}->add_command ("use_skill $skill", 947 $self->{map_widget}->add_command ("use_skill $skill",
692 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 948 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693 . $skill_help->{$skill}); 949 . $skill_help{$skill});
694 } 950 }
695} 951}
696 952
697sub eof { 953sub eof {
698 my ($self) = @_; 954 my ($self) = @_;
… …
739sub update_floorbox { 995sub update_floorbox {
740 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 996 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
741 return unless $::CONN; 997 return unless $::CONN;
742 998
743 $::FLOORBOX->clear; 999 $::FLOORBOX->clear;
1000
1001 my @add;
744 1002
745 my $row; 1003 my $row;
746 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1004 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
747 if ($row < 6) { 1005 if ($row < 6) {
748 local $_->{face_widget}; # hack to force recreation of widget 1006 local $_->{face_widget}; # hack to force recreation of widget
749 local $_->{desc_widget}; # hack to force recreation of widget 1007 local $_->{desc_widget}; # hack to force recreation of widget
750 CFPlus::Item::update_widgets $_; 1008 CFPlus::Item::update_widgets $_;
751 1009
1010 push @add,
752 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1011 0, $row, $_->{face_widget},
753 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1012 1, $row, $_->{desc_widget};
754 1013
755 $row++; 1014 $row++;
756 } else { 1015 } else {
757 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1016 push @add, 1, $row, new CFPlus::UI::Button
758 text => "More...", 1017 text => "More...",
759 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1018 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
760 ); 1019 ;
761 last; 1020 last;
762 } 1021 }
763 } 1022 }
764 if ($::CONN->{open_container}) { 1023 if ($::CONN->{open_container}) {
765 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1024 push @add, 1, $row++, new CFPlus::UI::Button
766 text => "Close container", 1025 text => "Close container",
767 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1026 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
768 ); 1027 ;
769 } 1028 }
1029
1030 $::FLOORBOX->add_at (@add);
770 }); 1031 });
771 1032
772 $::WANT_REFRESH++; 1033 $::WANT_REFRESH++;
773} 1034}
774 1035
… …
885 $::SERVER_INFO->set_markup ( 1146 $::SERVER_INFO->set_markup (
886 "server <tt>$self->{host}:$self->{port}</tt>\n" 1147 "server <tt>$self->{host}:$self->{port}</tt>\n"
887 . "protocol version <tt>$self->{version}</tt>\n" 1148 . "protocol version <tt>$self->{version}</tt>\n"
888 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1149 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
889 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1150 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1151 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1152 . "editing support $yesno[!!$self->{editor_support}]\n"
1153 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1154 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
890 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1155 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
891 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1156 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
892 . "map size $self->{mapw}×$self->{maph}\n" 1157 . "map size $self->{mapw}×$self->{maph}\n"
893 ); 1158 );
1159
1160 ::setup_build_button ($self->{editor_support}->{builder_ui});
894} 1161}
895 1162
896sub logged_in { 1163sub logged_in {
897 my ($self) = @_; 1164 my ($self) = @_;
898 1165
899 $self->send_ext_req (cfplus_support => "1", sub { 1166 $self->send_ext_req (cfplus_support => version => 1, sub {
900 $self->{cfplus_ext} = $_[0]; 1167 $self->{cfplus_ext} = $_[0]{version};
901 $self->update_server_info; 1168 $self->update_server_info;
1169
1170 if ($self->{cfplus_ext} >= 2) {
1171 $self->send_ext_req ("editor_support", sub {
1172 $self->{editor_support} = $_[0];
1173 $self->update_server_info;
1174
1175 0
1176 });
1177 }
1178
1179 0
902 }); 1180 });
903 1181
904 $self->update_server_info; 1182 $self->update_server_info;
905 1183
906 $self->send_command ("output-sync $::CFG->{output_sync}"); 1184 $self->send_command ("output-sync $::CFG->{output_sync}");
907 $self->send_command ("output-count $::CFG->{output_count}"); 1185 $self->send_command ("output-count $::CFG->{output_count}");
1186 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
908 $self->send_command ("pickup $::CFG->{pickup}"); 1187 $self->send_command ("pickup $::CFG->{pickup}");
1188}
1189
1190sub buildat {
1191 my ($self, $builditem, $x, $y) = @_;
1192
1193 if ($self->{cfplus_ext}) {
1194 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1195 }
909} 1196}
910 1197
911sub lookat { 1198sub lookat {
912 my ($self, $x, $y) = @_; 1199 my ($self, $x, $y) = @_;
913 1200
914 if ($self->{cfplus_ext}) { 1201 if ($self->{cfplus_ext}) {
915 $self->send_ext_req (lookat => "$x $y", sub { 1202 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
916 my %res = split /\x00/, $_[0]; 1203 my ($msg) = @_;
917 1204
918 if (exists $res{npc_dialog}) { 1205 if (exists $msg->{npc_dialog}) {
919 # start npc chat dialog 1206 # start npc chat dialog
920 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1207 $self->{npc_dialog} = new CFPlus::NPCDialog::
921 dx => $x, 1208 dx => $x,
922 dy => $y, 1209 dy => $y,
923 title => "$res{npc_dialog} (NPC)", 1210 title => "$msg->{npc_dialog} (NPC)",
924 conn => $self, 1211 conn => $self,
925 ; 1212 ;
926 } 1213 }
927 }); 1214 });
928 } 1215 }
… …
931} 1218}
932 1219
933sub destroy { 1220sub destroy {
934 my ($self) = @_; 1221 my ($self) = @_;
935 1222
936 $self->{npc_dialog}->destroy 1223 (delete $self->{npc_dialog})->destroy
937 if $self->{npc_dialog}; 1224 if $self->{npc_dialog};
938 1225
939 $self->SUPER::destroy; 1226 $self->SUPER::destroy;
1227
1228 %$self = ();
940} 1229}
941 1230
942package CFPlus::NPCDialog; 1231package CFPlus::NPCDialog;
943 1232
944our @ISA = 'CFPlus::UI::FancyFrame'; 1233our @ISA = 'CFPlus::UI::Toplevel';
945 1234
946sub new { 1235sub new {
947 my $class = shift; 1236 my $class = shift;
948 1237
949 my $self = $class->SUPER::new ( 1238 my $self = $class->SUPER::new (
… …
956 kw => { hi => 0, yes => 0, no => 0 }, 1245 kw => { hi => 0, yes => 0, no => 0 },
957 has_close_button => 1, 1246 has_close_button => 1,
958 @_, 1247 @_,
959 ); 1248 );
960 1249
961 Scalar::Util::weaken (my $this = $self); 1250 CFPlus::weaken (my $this = $self);
962 1251
963 $self->connect (delete => sub { $this->destroy; 1 }); 1252 $self->connect (delete => sub { $this->destroy; 1 });
964 1253
965 # better use a pane... 1254 # better use a pane...
966 $self->add (my $hbox = new CFPlus::UI::HBox); 1255 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
968 1257
969 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1258 $hbox->add (my $vbox = new CFPlus::UI::VBox);
970 1259
971 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1260 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1261 $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" 1262 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 { 1263 on_activate => sub {
979 my ($entry, $text) = @_; 1264 my ($entry, $text) = @_;
980 1265
981 return unless $text =~ /\S/; 1266 return unless $text =~ /\S/;
982 1267
… …
995 on_activate => sub { $this->destroy; 1 }, 1280 on_activate => sub { $this->destroy; 1 },
996 ; 1281 ;
997 1282
998 $self->update_options; 1283 $self->update_options;
999 1284
1000 $self->{token} = $self->{conn}->ext_token; 1285 $self->{id} = $self->{conn}->send_ext_req (
1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1286 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
1002 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1287 sub { $this && $this->feed (@_) }
1288 );
1003 1289
1004 $self->{entry}->grab_focus; 1290 $self->{entry}->grab_focus;
1005 1291
1006 $self->{textview}->add_paragraph ({ 1292 $self->{textview}->add_paragraph ({
1007 fg => [1, 1, 0, 1], 1293 fg => [1, 1, 0, 1],
… …
1013}; 1299};
1014 1300
1015sub update_options { 1301sub update_options {
1016 my ($self) = @_; 1302 my ($self) = @_;
1017 1303
1018 Scalar::Util::weaken $self; 1304 CFPlus::weaken $self;
1019 1305
1020 $self->{options}->clear; 1306 $self->{options}->clear;
1021 $self->{options}->add ($self->{bye_button}); 1307 $self->{options}->add ($self->{bye_button});
1022 1308
1023 for my $kw (sort keys %{ $self->{kw} }) { 1309 for my $kw (sort keys %{ $self->{kw} }) {
… …
1030 ); 1316 );
1031 } 1317 }
1032} 1318}
1033 1319
1034sub feed { 1320sub feed {
1035 my ($self, $data) = @_; 1321 my ($self, $msg) = @_;
1036 1322
1037 Scalar::Util::weaken $self; 1323 CFPlus::weaken $self;
1038 1324
1039 my ($type, $msg) = split / /, $data, 2; 1325 if ($msg->{msgtype} eq "reply") {
1326 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1327 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1040 1328
1041 if ($type eq "msg") { 1329 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{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;
1049 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1330 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1050 my @link; 1331 my @link;
1051 $msg =~ s{ 1332 $text =~ s{
1052 ($match) 1333 ($match)
1053 }{ 1334 }{
1054 my $kw = $1; 1335 my $kw = $1;
1055 1336
1056 push @link, new CFPlus::UI::Label 1337 push @link, new CFPlus::UI::Label
… …
1061 padding_y => 0, 1342 padding_y => 0,
1062 on_button_up => sub { 1343 on_button_up => sub {
1063 $self->send ($kw); 1344 $self->send ($kw);
1064 }; 1345 };
1065 1346
1066 chr 0xfffc 1347 "\x{fffc}"
1067 }giex; 1348 }giex;
1068 1349
1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1350 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1070 $self->{textview}->scroll_to_bottom; 1351 $self->{textview}->scroll_to_bottom;
1071 $self->update_options; 1352 $self->update_options;
1072 } else { 1353 } else {
1073 $self->destroy; 1354 $self->destroy;
1074 } 1355 }
… …
1080 my ($self, $msg) = @_; 1361 my ($self, $msg) = @_;
1081 1362
1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1363 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083 $self->{textview}->scroll_to_bottom; 1364 $self->{textview}->scroll_to_bottom;
1084 1365
1085 utf8::encode $msg; 1366 $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} 1367}
1088 1368
1089sub destroy { 1369sub destroy {
1090 my ($self) = @_; 1370 my ($self) = @_;
1091 1371
1092 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1372 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1093 1373
1374 if ($self->{conn}) {
1094 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1375 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1095 delete $self->{conn}{npc_dialog}; 1376 delete $self->{conn}{npc_dialog};
1096 $self->{conn}->disconnect_ext ($self->{token}); 1377 $self->{conn}->disconnect_ext ($self->{id});
1378 }
1097 1379
1098 $self->SUPER::destroy; 1380 $self->SUPER::destroy;
1099} 1381}
1100 1382
11011 13831
1384

Diff Legend

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