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.133 by elmex, Tue Jul 24 18:39:39 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,#d#
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) }
41 @args; 49 @args
50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*";
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
60 $self->connect_ext (capabilities => sub {
61 my (%cap) = @_;
62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
68 if (my $ts = $cap{tileset}) {
69 if (my ($default) = grep $_->[2] & 1, @$ts) {
70 $self->{tileset} = $default;
71 $self->{tilesize} = $default->[3];
72 $self->setup_req (tileset => $default->[0]);
73
74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
75 my $h = int $self->{maph} * 32 / $self->{tilesize};
76
77 $self->setup_req (mapsize => "${w}x${h}");
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 => {},
42 } 94 };
43
44 \@cmd_help
45 }; 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} || {}};
200 }
201 });
46 202
47 $self->{map_widget}->add_command (@$_) 203 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 204 for @cmd_help;
49 205
206 {
207 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
208 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
209 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
210 }
211
212 {
50 $self->{noface} = new_from_file CFPlus::Texture 213 $self->{noface} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 214 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
215 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
216 }
52 217
53 $self->{open_container} = 0; 218 $self->{open_container} = 0;
54 219
55 # "global"
56 $self->{tilecache} = CFPlus::db_table "tilecache";
57 $self->{facemap} = CFPlus::db_table "facemap";
58
59 # per server 220 # per server
60 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 221 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
61 222
62 $self 223 $self
63} 224}
64 225
65sub logprint { 226sub logprint {
… …
222 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 383 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
223 $::GAUGES->{food} ->set_value ($fo, $fo_m); 384 $::GAUGES->{food} ->set_value ($fo, $fo_m);
224 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 385 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
225 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 386 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
226 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 387 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
227 my $rng = $stats->{+CS_STAT_RANGE}; 388 $::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}; 389 my $title = $stats->{+CS_STAT_TITLE};
231 $title =~ s/^Player: //; 390 $title =~ s/^Player: //;
232 $::STATWIDS->{title} ->set_text ("Title: " . $title); 391 $::STATWIDS->{title} ->set_text ("Title: " . $title);
233 392
234 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 393 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
254 my @skills = keys %{ $self->{skill_info} }; 413 my @skills = keys %{ $self->{skill_info} };
255 414
256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 415 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
257 $sktbl->clear; 416 $sktbl->clear;
258 417
418 my @add;
419
420 push @add,
259 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 421 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
260 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 422 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
261 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 423 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
262 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 424 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
263 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 425 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
264 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 426 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
427 ;
265 428
266 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>";
267 430
268 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);
269 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);
270 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
271 433
272 my ($x, $y) = (0, 1); 434 my ($x, $y) = (0, 1);
273 for ( 435 for (
274 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 436 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
275 map [$_, $self->{skill_info}{$_}], 437 map [$_, $self->{skill_info}{$_}],
… …
284 if ($ev->{button} == 1) { 446 if ($ev->{button} == 1) {
285 $::CONN->user_send ("ready_skill $name"); 447 $::CONN->user_send ("ready_skill $name");
286 } elsif ($ev->{button} == 2) { 448 } elsif ($ev->{button} == 2) {
287 $::CONN->user_send ("use_skill $name"); 449 $::CONN->user_send ("use_skill $name");
288 } elsif ($ev->{button} == 3) { 450 } elsif ($ev->{button} == 3) {
451 my $shortname = CFPlus::shorten $name, 14;
289 (new CFPlus::UI::Menu 452 (new CFPlus::UI::Menu
290 items => [ 453 items => [
291 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 454 ["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"]) }], 455 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
293 ], 456 ],
294 )->popup ($ev); 457 )->popup ($ev);
295 } else { 458 } else {
296 return 0; 459 return 0;
297 } 460 }
298 461
299 1 462 1
300 }; 463 };
301 464
465 push @add,
302 $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
303 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),
304 $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
305 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),
306 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 470 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
471 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
472 ;
307 473
308 $x++ and ($x, $y) = (0, $y + 1); 474 $x++ and ($x, $y) = (0, $y + 1);
309 } 475 }
476
477 $sktbl->add_at (@add);
310 } 478 }
311 479
312 for (grep exists $stats->{$_}, @skills) { 480 for (grep exists $stats->{$_}, @skills) {
313 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 481 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
314 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 482 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
315 } 483 }
316} 484}
317 485
486sub macro_send {
487 my ($self, $macro) = @_;
488
489 for my $cmd (@{ $macro->{action} }) {
490 $self->send_command ($cmd);
491 }
492}
493
318sub user_send { 494sub user_send {
319 my ($self, $command) = @_; 495 my ($self, $command) = @_;
320 496
497 $self->{record}->($command)
321 if ($self->{record}) { 498 if $self->{record};
322 push @{$self->{record}}, $command;
323 }
324 499
325 $self->logprint ("send: ", $command); 500 $self->logprint ("send: ", $command);
326 $self->send_command ($command); 501 $self->send_command ($command);
327 ::status ($command); 502 ::status ($command);
328} 503}
329 504
330sub start_record { 505sub record {
331 my ($self) = @_; 506 my ($self, $cb) = @_;
332 507
333 $self->{record} = []; 508 $self->{record} = $cb;
334}
335
336sub stop_record {
337 my ($self) = @_;
338 return delete $self->{record};
339} 509}
340 510
341sub map_scroll { 511sub map_scroll {
342 my ($self, $dx, $dy) = @_; 512 my ($self, $dx, $dy) = @_;
343 513
… …
345} 515}
346 516
347sub feed_map1a { 517sub feed_map1a {
348 my ($self, $data) = @_; 518 my ($self, $data) = @_;
349 519
350 $self->{map}->map1a_update ($data); 520 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
351 $self->{map_widget}->update; 521 $self->{map_widget}->update;
352} 522}
353 523
354sub magicmap { 524sub magicmap {
355 my ($self, $w, $h, $x, $y, $data) = @_; 525 my ($self, $w, $h, $x, $y, $data) = @_;
… …
364 or return; 534 or return;
365 535
366 my ($hash, $x, $y, $w, $h) = @$map_info; 536 my ($hash, $x, $y, $w, $h) = @$map_info;
367 537
368 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 538 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
369 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 539 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
370 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 540 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
371} 541}
372 542
373sub map_clear { 543sub map_clear {
374 my ($self) = @_; 544 my ($self) = @_;
… …
378 548
379 $self->{map}->clear; 549 $self->{map}->clear;
380 delete $self->{map_widget}{magicmap}; 550 delete $self->{map_widget}{magicmap};
381} 551}
382 552
553sub bg_fetch {
554 my ($self) = @_;
555
556 my $id;
557
558 do {
559 $id = pop @{$self->{bg_fetch}}
560 or return;
561 } while $self->{texture}[$id];
562
563 CFPlus::DB::get tilecache => $id, sub {
564 my ($data) = @_;
565
566 return unless $self->{map}; # stop when destroyed
567
568 $self->set_texture ($id => $data)
569 if defined $data;
570
571 $self->bg_fetch;
572 };
573}
383 574
384sub load_map($$$) { 575sub load_map($$$) {
385 my ($self, $hash, $x, $y) = @_; 576 my ($self, $hash, $x, $y) = @_;
386 577
387 if (defined (my $data = $self->{mapcache}->get ($hash))) { 578 my $gen = $self->{map_change_gen};
579
580 CFPlus::DB::get $self->{mapcache} => $hash, sub {
581 return unless $gen == $self->{map_change_gen};
582
583 my ($data) = @_;
584
585 if (defined $data) {
388 $data = Compress::LZF::decompress $data; 586 $data = Compress::LZF::decompress $data;
389 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 587 #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 588
394 $self->set_texture ($id => $data); 589 my $inprogress = @{ $self->{bg_fetch} || [] };
590 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
591 $self->bg_fetch unless $inprogress;
395 } 592 }
396 } 593 };
397} 594}
398 595
399# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 596# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
400# (server resource,s latency, bandwidth), so this hack is warranted. 597# (server resource,s latency, bandwidth), so this hack is warranted.
401# the right fix is to make real tiled maps with an overview file 598# the right fix is to make real tiled maps with an overview file
… …
465 662
466 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 663 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
467 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 664 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
468 665
469 } else { 666 } else {
667 my $gen = $self->{map_change_gen};
470 $self->send_mapinfo ("spatial $path$tile", sub { 668 $self->send_mapinfo ("spatial $path$tile", sub {
669 return unless $gen == $self->{map_change_gen};
670
471 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 671 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
472 672
473 return if $mode ne "spatial"; 673 return if $mode ne "spatial";
474 674
475 $x += $self->{map}->ox; 675 $x += $self->{map}->ox;
… …
489 689
490sub map_change { 690sub map_change {
491 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 691 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
492 692
493 $self->flush_map; 693 $self->flush_map;
694
695 ++$self->{map_change_gen};
494 696
495 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 697 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
496 698
497 my $mapmapw = $self->{mapmap}->{w}; 699 my $mapmapw = $self->{mapmap}->{w};
498 my $mapmaph = $self->{mapmap}->{h}; 700 my $mapmaph = $self->{mapmap}->{h};
… …
515 $self->load_map ($hash, $x, $y); 717 $self->load_map ($hash, $x, $y);
516 $self->flood_fill (0, 0, 0, "", $hash, $flags); 718 $self->flood_fill (0, 0, 0, "", $hash, $flags);
517} 719}
518 720
519sub face_find { 721sub face_find {
520 my ($self, $facenum, $face) = @_; 722 my ($self, $facenum, $face, $cb) = @_;
521 723
522 my $hash = "$face->{chksum},$face->{name}"; 724 if ($face->{type} == 0) { # FT_FACE
725 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
523 726
524 my $id = $self->{facemap}->get ($hash); 727 $face->{id} = $id;
525
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;
549 $self->{map}->set_face ($facenum => $id);
550 $self->{faceid}[$facenum] = $id;#d# 728 $self->{faceid}[$facenum] = $id;
551 729
552 my $face = $self->{tilecache}->get ($id); 730 $self->{map}->set_tileid ($facenum => $id);
553 731
554 if ($face) { 732 CFPlus::DB::get tilecache => $id, $cb;
555 #$self->face_prefetch; 733
556 $face 734 } elsif ($face->{type} & 1) { # with metadata
557 } else { 735 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
558 my $tex = $self->{noface}; 736 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
559 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
560 undef
561 }; 737 }
562} 738}
563 739
564sub face_update { 740sub face_update {
565 my ($self, $facenum, $face, $changed) = @_; 741 my ($self, $facenum, $face, $changed) = @_;
566 742
567 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 743 if ($face->{type} == 0) { # FT_FACE
744 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
745 if $changed;
568 746
569 $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 }
780}
781
782sub smooth_update {
783 my ($self, $facenum, $face) = @_;
784
785 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
570} 786}
571 787
572sub set_texture { 788sub set_texture {
573 my ($self, $id, $data) = @_; 789 my ($self, $id, $data) = @_;
574 790
791 return unless $self->{map};
792
575 $self->{texture}[$id] ||= do { 793 $self->{texture}[$id] = my $tex =
576 my $tex =
577 new_from_image CFPlus::Texture 794 new_from_image CFPlus::Texture
578 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
579 796
580 $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}});
581 $self->{map_widget}->update; 798 $self->{map_widget}->update;
582 799
583 $tex 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}};
584 }; 812 }
585} 813}
586 814
587sub sound_play { 815sub sound_play {
588 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
589 817
… …
599 $LAST_QUERY = $prompt; 827 $LAST_QUERY = $prompt;
600 828
601 $self->{query}-> ($self, $flags, $prompt); 829 $self->{query}-> ($self, $flags, $prompt);
602} 830}
603 831
604sub drawinfo { 832sub sanitise_xml($) {
605 my ($self, $color, $text) = @_; 833 local $_ = shift;
606 834
607 my @color = ( 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 $_
845}
846
847our %NAME_TO_COLOR = (
848 black => 0,
849 white => 1,
850 darkblue => 2,
851 red => 3,
852 orange => 4,
853 lightblue => 5,
854 darkorange => 6,
855 green => 7,
856 darkgreen => 8,
857 grey => 9,
858 brown => 10,
859 yellow => 11,
860 tan => 12,
861);
862
863our @CF_COLOR = (
608 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 864 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
609 [1.00, 1.00, 1.00], 865 [1.00, 1.00, 1.00],
610 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 866 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
611 [1.00, 0.00, 0.00], 867 [1.00, 0.00, 0.00],
612 [1.00, 0.54, 0.00], 868 [1.00, 0.54, 0.00],
613 [0.11, 0.56, 1.00], 869 [0.11, 0.56, 1.00],
614 [0.93, 0.46, 0.00], 870 [0.93, 0.46, 0.00],
615 [0.18, 0.54, 0.34], 871 [0.18, 0.54, 0.34],
616 [0.56, 0.73, 0.56], 872 [0.56, 0.73, 0.56],
617 [0.80, 0.80, 0.80], 873 [0.80, 0.80, 0.80],
618 [0.75, 0.61, 0.20], 874 [0.75, 0.61, 0.20],
619 [0.99, 0.77, 0.26], 875 [0.99, 0.77, 0.26],
620 [0.74, 0.65, 0.41], 876 [0.74, 0.65, 0.41],
621 ); 877);
622 878
879sub msg {
880 my ($self, $color, $type, $text, @extra) = @_;
881
882 $text = sanitise_xml $text;
883
884 if (my $cb = $self->{cb_msg}{$type}) {
885 $_->($self, $color, $type, $text, @extra) for values %$cb;
886 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
887 $type =~ s/-/_/g;
888 $self->{$type} = $text;
889 } else {
623 $self->logprint ("info: ", $text); 890 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood
624 892
625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 893 my $fg = $CF_COLOR[$color % @CF_COLOR];
626 894
627 # 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
896 # no longer neecssary with TRT servers
628 $text =~ s/(?<=\S)\n(?=\w)/ /g; 897 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
629 898
630 $text = CFPlus::asxml $text; 899 ::message ({ fg => $fg, markup => $_, type => $type })
631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 900 for split /\n/, $text;
632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
633 901
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, 902 $self->{statusbox}->add ($text,
639 group => $text, 903 group => $text,
640 fg => $color[$color], 904 fg => $fg,
641 timeout => $color >= 2 ? 60 : 10, 905 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 906 tooltip_font => $::FONT_FIXED,
643 ); 907 );
644} 908 }
645
646sub drawextinfo {
647 my ($self, $color, $type, $subtype, $message) = @_;
648
649 $self->drawinfo ($color, $message);
650} 909}
651 910
652sub spell_add { 911sub spell_add {
653 my ($self, $spell) = @_; 912 my ($self, $spell) = @_;
654 913
655 # try to create single paragraphs out of the multiple lines sent by the server 914 # try to create single paragraphs out of the multiple lines sent by the server
656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 915 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
657 $spell->{message} =~ s/\n+$//; 916 $spell->{message} =~ s/\n+$//;
658 $spell->{message} ||= "Server did not provide a description for this spell."; 917 $spell->{message} ||= "Server did not provide a description for this spell.";
659 918
660 $::SPELL_PAGE->add_spell ($spell); 919 $::SPELL_LIST->add_spell ($spell);
661 920
662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 921 $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}); 922 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
664} 923}
665 924
666sub spell_delete { 925sub spell_delete {
667 my ($self, $spell) = @_; 926 my ($self, $spell) = @_;
668 927
669 $::SPELL_PAGE->remove_spell ($spell); 928 $::SPELL_LIST->remove_spell ($spell);
929}
930
931sub setup {
932 my ($self, $setup) = @_;
933
934 $self->{map_widget}->set_tilesize ($self->{tilesize});
935 $::MAP->resize ($self->{mapw}, $self->{maph});
670} 936}
671 937
672sub addme_success { 938sub addme_success {
673 my ($self) = @_; 939 my ($self) = @_;
674 940
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; 941 my %skill_help;
679 942
680 for my $head2 ($pom->head1->[3]->head2) { 943 for my $node (CFPlus::Pod::find skill_description => "*") {
681 $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content; 944 my (undef, @par) = CFPlus::Pod::section_of $node;
682 } 945 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684 \%skill_help
685 }; 946 };
686 947
687 for my $skill (values %{$self->{skill_info}}) { 948 for my $skill (values %{$self->{skill_info}}) {
688 $self->{map_widget}->add_command ("ready_skill $skill", 949 $self->{map_widget}->add_command ("ready_skill $skill",
689 (CFPlus::asxml "Ready the skill '$skill'\n\n") 950 (CFPlus::asxml "Ready the skill '$skill'\n\n")
690 . $skill_help->{$skill}); 951 . $skill_help{$skill});
691 $self->{map_widget}->add_command ("use_skill $skill", 952 $self->{map_widget}->add_command ("use_skill $skill",
692 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 953 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693 . $skill_help->{$skill}); 954 . $skill_help{$skill});
694 } 955 }
695} 956}
696 957
697sub eof { 958sub eof {
698 my ($self) = @_; 959 my ($self) = @_;
… …
739sub update_floorbox { 1000sub update_floorbox {
740 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
741 return unless $::CONN; 1002 return unless $::CONN;
742 1003
743 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
1005
1006 my @add;
744 1007
745 my $row; 1008 my $row;
746 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} }) {
747 if ($row < 6) { 1010 if ($row < 6) {
748 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
749 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
750 CFPlus::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
751 1014
1015 push @add,
752 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
753 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
754 1018
755 $row++; 1019 $row++;
756 } else { 1020 } else {
757 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1021 push @add, 1, $row, new CFPlus::UI::Button
758 text => "More...", 1022 text => "More...",
759 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
760 ); 1024 ;
761 last; 1025 last;
762 } 1026 }
763 } 1027 }
764 if ($::CONN->{open_container}) { 1028 if ($::CONN->{open_container}) {
765 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1029 push @add, 1, $row++, new CFPlus::UI::Button
766 text => "Close container", 1030 text => "Close container",
767 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
768 ); 1032 ;
769 } 1033 }
1034
1035 $::FLOORBOX->add_at (@add);
770 }); 1036 });
771 1037
772 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
773} 1039}
774 1040
… …
885 $::SERVER_INFO->set_markup ( 1151 $::SERVER_INFO->set_markup (
886 "server <tt>$self->{host}:$self->{port}</tt>\n" 1152 "server <tt>$self->{host}:$self->{port}</tt>\n"
887 . "protocol version <tt>$self->{version}</tt>\n" 1153 . "protocol version <tt>$self->{version}</tt>\n"
888 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1154 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
889 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1155 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1156 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1157 . "editing support $yesno[!!$self->{editor_support}]\n"
1158 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1159 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
890 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
891 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
892 . "map size $self->{mapw}×$self->{maph}\n" 1162 . "map size $self->{mapw}×$self->{maph}\n"
893 ); 1163 );
1164
1165 ::setup_build_button ($self->{editor_support}->{builder_ui});
894} 1166}
895 1167
896sub logged_in { 1168sub logged_in {
897 my ($self) = @_; 1169 my ($self) = @_;
898 1170
899 $self->send_ext_req (cfplus_support => "1", sub { 1171 $self->send_ext_req (cfplus_support => version => 2, sub {
1172 my (%msg) = @_;
1173
900 $self->{cfplus_ext} = $_[0]; 1174 $self->{cfplus_ext} = $msg{version};
901 $self->update_server_info; 1175 $self->update_server_info;
1176
1177 if ($self->{cfplus_ext} >= 2) {
1178 $self->send_ext_req ("editor_support", sub {
1179 $self->{editor_support} = { @_ };
1180 $self->update_server_info;
1181
1182 0
1183 });
1184 }
1185
1186 0
902 }); 1187 });
903 1188
904 $self->update_server_info; 1189 $self->update_server_info;
905 1190
906 $self->send_command ("output-sync $::CFG->{output_sync}"); 1191 $self->send_command ("output-sync $::CFG->{output_sync}");
907 $self->send_command ("output-count $::CFG->{output_count}"); 1192 $self->send_command ("output-count $::CFG->{output_count}");
1193 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
908 $self->send_command ("pickup $::CFG->{pickup}"); 1194 $self->send_command ("pickup $::CFG->{pickup}");
1195}
1196
1197sub buildat {
1198 my ($self, $builditem, $x, $y) = @_;
1199
1200 if ($self->{cfplus_ext}) {
1201 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1202 }
909} 1203}
910 1204
911sub lookat { 1205sub lookat {
912 my ($self, $x, $y) = @_; 1206 my ($self, $x, $y) = @_;
913 1207
914 if ($self->{cfplus_ext}) { 1208 if ($self->{cfplus_ext}) {
915 $self->send_ext_req (lookat => "$x $y", sub { 1209 $self->send_ext_req (lookat => $x, $y, sub {
916 my %res = split /\x00/, $_[0]; 1210 my (%msg) = @_;
917 1211
918 if (exists $res{npc_dialog}) { 1212 if (exists $msg{npc_dialog}) {
919 # start npc chat dialog 1213 # start npc chat dialog
920 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1214 $self->{npc_dialog} = new CFPlus::NPCDialog::
921 dx => $x, 1215 token => $msg{npc_dialog},
922 dy => $y,
923 title => "$res{npc_dialog} (NPC)", 1216 title => "$msg{npc_dialog}[0] (NPC)",
924 conn => $self, 1217 conn => $self,
925 ; 1218 ;
926 } 1219 }
927 }); 1220 });
928 } 1221 }
… …
931} 1224}
932 1225
933sub destroy { 1226sub destroy {
934 my ($self) = @_; 1227 my ($self) = @_;
935 1228
936 $self->{npc_dialog}->destroy 1229 (delete $self->{npc_dialog})->destroy
937 if $self->{npc_dialog}; 1230 if $self->{npc_dialog};
938 1231
939 $self->SUPER::destroy; 1232 $self->SUPER::destroy;
1233
1234 %$self = ();
940} 1235}
941 1236
942package CFPlus::NPCDialog; 1237package CFPlus::NPCDialog;
943 1238
944our @ISA = 'CFPlus::UI::FancyFrame'; 1239our @ISA = 'CFPlus::UI::Toplevel';
945 1240
946sub new { 1241sub new {
947 my $class = shift; 1242 my $class = shift;
948 1243
949 my $self = $class->SUPER::new ( 1244 my $self = $class->SUPER::new (
… …
956 kw => { hi => 0, yes => 0, no => 0 }, 1251 kw => { hi => 0, yes => 0, no => 0 },
957 has_close_button => 1, 1252 has_close_button => 1,
958 @_, 1253 @_,
959 ); 1254 );
960 1255
961 Scalar::Util::weaken (my $this = $self); 1256 CFPlus::weaken (my $this = $self);
962 1257
963 $self->connect (delete => sub { $this->destroy; 1 }); 1258 $self->connect (delete => sub { $this->destroy; 1 });
964 1259
965 # better use a pane... 1260 # better use a pane...
966 $self->add (my $hbox = new CFPlus::UI::HBox); 1261 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
968 1263
969 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1264 $hbox->add (my $vbox = new CFPlus::UI::VBox);
970 1265
971 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1266 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1267 $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" 1268 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 { 1269 on_activate => sub {
979 my ($entry, $text) = @_; 1270 my ($entry, $text) = @_;
980 1271
981 return unless $text =~ /\S/; 1272 return unless $text =~ /\S/;
982 1273
… …
995 on_activate => sub { $this->destroy; 1 }, 1286 on_activate => sub { $this->destroy; 1 },
996 ; 1287 ;
997 1288
998 $self->update_options; 1289 $self->update_options;
999 1290
1000 $self->{token} = $self->{conn}->ext_token; 1291 $self->{id} = "npc-channel-" . $self->{conn}->token;
1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1292 $self->{conn}->connect_ext ($self->{id} => sub {
1002 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1293 $this->feed (@_) if $this;
1294 });
1295
1296 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1003 1297
1004 $self->{entry}->grab_focus; 1298 $self->{entry}->grab_focus;
1005 1299
1006 $self->{textview}->add_paragraph ({ 1300 $self->{textview}->add_paragraph ({
1007 fg => [1, 1, 0, 1], 1301 fg => [1, 1, 0, 1],
… …
1013}; 1307};
1014 1308
1015sub update_options { 1309sub update_options {
1016 my ($self) = @_; 1310 my ($self) = @_;
1017 1311
1018 Scalar::Util::weaken $self; 1312 CFPlus::weaken $self;
1019 1313
1020 $self->{options}->clear; 1314 $self->{options}->clear;
1021 $self->{options}->add ($self->{bye_button}); 1315 $self->{options}->add ($self->{bye_button});
1022 1316
1023 for my $kw (sort keys %{ $self->{kw} }) { 1317 for my $kw (sort keys %{ $self->{kw} }) {
… …
1030 ); 1324 );
1031 } 1325 }
1032} 1326}
1033 1327
1034sub feed { 1328sub feed {
1035 my ($self, $data) = @_; 1329 my ($self, $type, @arg) = @_;
1036 1330
1037 Scalar::Util::weaken $self; 1331 CFPlus::weaken $self;
1038 1332
1039 my ($type, $msg) = split / /, $data, 2;
1040
1041 if ($type eq "msg") { 1333 if ($type eq "update") {
1042 my ($msg, @kw) = split /\x00/, $msg; 1334 my (%info) = @arg;
1043 1335
1044 utf8::decode $_ for ($msg, @kw); 1336 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1337 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1045 1338
1046 $self->{kw}{$_} = 1 for @kw; 1339 if (exists $info{msg}) {
1047 1340 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1048 $msg = "\n" . CFPlus::UI::asxml $msg;
1049 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1341 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1050 my @link; 1342 my @link;
1051 $msg =~ s{ 1343 $text =~ s{
1052 ($match) 1344 ($match)
1053 }{ 1345 }{
1054 my $kw = $1; 1346 my $kw = $1;
1055 1347
1056 push @link, new CFPlus::UI::Label 1348 push @link, new CFPlus::UI::Label
1057 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1349 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1058 can_hover => 1, 1350 can_hover => 1,
1059 can_events => 1, 1351 can_events => 1,
1060 padding_x => 0, 1352 padding_x => 0,
1061 padding_y => 0, 1353 padding_y => 0,
1062 on_button_up => sub { 1354 on_button_up => sub {
1063 $self->send ($kw); 1355 $self->send ($kw);
1064 }; 1356 };
1065 1357
1066 chr 0xfffc 1358 "\x{fffc}"
1067 }giex; 1359 }giex;
1068 1360
1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1361 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1070 $self->{textview}->scroll_to_bottom; 1362 $self->{textview}->scroll_to_bottom;
1363 }
1364
1071 $self->update_options; 1365 $self->update_options;
1072 } else { 1366 } else {
1073 $self->destroy; 1367 $self->destroy;
1074 } 1368 }
1075 1369
… …
1080 my ($self, $msg) = @_; 1374 my ($self, $msg) = @_;
1081 1375
1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1376 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083 $self->{textview}->scroll_to_bottom; 1377 $self->{textview}->scroll_to_bottom;
1084 1378
1085 utf8::encode $msg;
1086 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1379 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1087} 1380}
1088 1381
1089sub destroy { 1382sub destroy {
1090 my ($self) = @_; 1383 my ($self) = @_;
1091 1384
1092 #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
1093 1386
1387 if ($self->{conn}) {
1094 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1388 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1095 delete $self->{conn}{npc_dialog}; 1389 delete $self->{conn}{npc_dialog};
1096 $self->{conn}->disconnect_ext ($self->{token}); 1390 $self->{conn}->disconnect_ext ($self->{id});
1391 }
1097 1392
1098 $self->SUPER::destroy; 1393 $self->SUPER::destroy;
1099} 1394}
1100 1395
11011 13961
1397

Diff Legend

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