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.67 by root, Mon Jul 24 08:23:28 2006 UTC vs.
Revision 1.118 by root, Fri Jul 13 15:44:48 2007 UTC

1package CFClient::Protocol; 1package CFPlus::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient; 8use CFPlus;
9use CFPlus::DB;
9use CFClient::UI; 10use CFPlus::UI;
10use CFClient::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 = CFClient::Pod::load CFClient::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 = CFClient::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) = @_;
73
74 if (defined $meta) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
76 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1];
81
82 CFPlus::DB::write_file $chksum, $data, sub { };
83 CFPlus::DB::put "res-metadata" => $chksum => $meta, sub { };
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
86 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs});
41 @args; 89 });
90 }
91 }
92 }
93 }
94
95 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 }
98 });
99
100 $self->connect_ext (event_capabilities => sub {
101 my ($cap) = @_;
102
103 if (my $ts = $cap->{tileset}) {
104 if (my ($default) = grep $_->[2] & 1, @$ts) {
105 $self->{tileset} = $default;
106 $self->{tilesize} = $default->[3];
107 $self->setup_req (tileset => $default->[0]);
108
109 my $w = int $self->{mapw} * 32 / $self->{tilesize};
110 my $h = int $self->{maph} * 32 / $self->{tilesize};
111
112 $self->setup_req (mapsize => "${w}x${h}");
113 }
114 }
115 });
116
117 $self->{json_coder}
118 ->convert_blessed
119 ->filter_json_single_key_object (__widget_ref__ => sub {
120 $self->{widget}{$_[0]}
121 });
122
123 $self->connect_ext (ws_n => sub {
124 my ($arg) = @_;
125
126 $self->{widgetset}{$arg{id}} = {
127 w => {},
42 } 128 };
43
44 \@cmd_help
45 }; 129 });
130
131 $self->connect_ext (ws_d => sub {
132 my ($arg) = @_;
133
134 my $ws = delete $self->{widgetset}{$arg{id}}
135 or return;
136
137 $_->destroy
138 for values %{$ws->{w}};
139 });
140
141 $self->connect_ext (ws_c => sub {
142 my ($arg) = @_;
143
144 my $args = $arg->{args} || {};
145
146 for my $ev (grep /^on_/, keys %$args) {
147 $args->{$ev} = sub {
148 my $id = shift->{s_id};
149 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
150
151 1
152 };
153 }
154
155 if (my $widget = eval {
156 local $SIG{__DIE__};
157 "CFPlus::UI::$arg->{class}"->new (
158 %$args,
159 s_ws => $arg->{ws},
160 s_id => $arg->{id},
161 )
162 }
163 ) {
164 $self->{widget}{$arg->{id}}
165 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
166 = $widget;
167
168 $widget->connect (on_destroy => sub {
169 my ($widget) = @_;
170
171 delete $self->{widget}{$widget->{s_id}};
172 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
173 });
174 } else {
175 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
176 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
177 }
178 });
179
180 $self->connect_ext (w_c => sub {
181 my ($arg) = @_;
182
183 my $w = $self->{widget}{$arg->{id}}
184 or return;
185 my $m = $arg->{name};
186
187 my $a = $arg->{args} || [];
188
189 if (exists $arg->{rid}) {
190 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
191 } else {
192 $w->$m (@$a);
193 }
194 });
195
196 $self->connect_ext (w_s => sub {
197 my ($arg) = @_;
198
199 my $w = $self->{widget}{$arg->{id}}
200 or return;
201
202 $w->{$arg->{name}} = $arg->{value};
203 });
204
205 $self->connect_ext (w_g => sub {
206 my ($arg) = @_;
207
208 my $w = $self->{widget}{$arg->{id}}
209 or return;
210
211 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
212 });
213
214 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
215 for my $ws (values %{delete $self->{widgetset} || {}}) {
216 $_->destroy
217 for values %{delete $ws->{w} || {}};
218 }
219 });
46 220
47 $self->{map_widget}->add_command (@$_) 221 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 222 for @cmd_help;
49 223
224 {
225 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
226 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
227 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
228 }
229
230 {
50 $self->{noface} = new_from_file CFClient::Texture 231 $self->{noface} = my $tex = new_from_file CFPlus::Texture
51 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 232 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
233 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
234 }
52 235
53 $self->{open_container} = 0; 236 $self->{open_container} = 0;
54 237
55 # "global"
56 $self->{tilecache} = CFClient::db_table "tilecache";
57 $self->{facemap} = CFClient::db_table "facemap";
58
59 # per server 238 # per server
60 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 239 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
61 240
62 $self 241 $self
63} 242}
64 243
65sub logprint { 244sub logprint {
… …
222 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 401 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
223 $::GAUGES->{food} ->set_value ($fo, $fo_m); 402 $::GAUGES->{food} ->set_value ($fo, $fo_m);
224 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 403 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
225 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 404 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
226 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 405 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
227 my $rng = $stats->{+CS_STAT_RANGE}; 406 $::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}; 407 my $title = $stats->{+CS_STAT_TITLE};
231 $title =~ s/^Player: //; 408 $title =~ s/^Player: //;
232 $::STATWIDS->{title} ->set_text ("Title: " . $title); 409 $::STATWIDS->{title} ->set_text ("Title: " . $title);
233 410
234 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 411 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
254 my @skills = keys %{ $self->{skill_info} }; 431 my @skills = keys %{ $self->{skill_info} };
255 432
256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 433 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
257 $sktbl->clear; 434 $sktbl->clear;
258 435
259 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 436 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
260 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 437 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
261 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 438 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
262 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 439 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
263 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 440 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
264 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 441 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
442
443 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
444
445 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
446 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
265 447
266 my ($x, $y) = (0, 1); 448 my ($x, $y) = (0, 1);
267 for ( 449 for (
268 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 450 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
269 map [$_, $self->{skill_info}{$_}], 451 map [$_, $self->{skill_info}{$_}],
270 grep exists $stats->{$_}, 452 grep exists $stats->{$_},
271 @skills 453 @skills
272 ) { 454 ) {
273 my ($idx, $name) = @$_; 455 my ($idx, $name) = @$_;
274 456
457 my $spell_cb = sub {
458 my ($widget, $ev) = @_;
459
460 if ($ev->{button} == 1) {
461 $::CONN->user_send ("ready_skill $name");
462 } elsif ($ev->{button} == 2) {
463 $::CONN->user_send ("use_skill $name");
464 } elsif ($ev->{button} == 3) {
465 my $shortname = CFPlus::shorten $name, 14;
466 (new CFPlus::UI::Menu
467 items => [
468 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
469 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
470 ],
471 )->popup ($ev);
472 } else {
473 return 0;
474 }
475
476 1
477 };
478
275 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 479 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
276 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 480 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
277 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 481 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
278 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 482 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
279 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 483 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
484 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
280 485
281 $x++ and ($x, $y) = (0, $y + 1); 486 $x++ and ($x, $y) = (0, $y + 1);
282 } 487 }
283 } 488 }
284 489
… …
286 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 491 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
287 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 492 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
288 } 493 }
289} 494}
290 495
496sub macro_send {
497 my ($self, $macro) = @_;
498
499 for my $cmd (@{ $macro->{action} }) {
500 $self->send_command ($cmd);
501 }
502}
503
291sub user_send { 504sub user_send {
292 my ($self, $command) = @_; 505 my ($self, $command) = @_;
293 506
507 $self->{record}->($command)
294 if ($self->{record}) { 508 if $self->{record};
295 push @{$self->{record}}, $command;
296 }
297 509
298 $self->logprint ("send: ", $command); 510 $self->logprint ("send: ", $command);
299 $self->send_command ($command); 511 $self->send_command ($command);
300 ::status ($command); 512 ::status ($command);
301} 513}
302 514
303sub start_record { 515sub record {
304 my ($self) = @_; 516 my ($self, $cb) = @_;
305 517
306 $self->{record} = []; 518 $self->{record} = $cb;
307}
308
309sub stop_record {
310 my ($self) = @_;
311 return delete $self->{record};
312} 519}
313 520
314sub map_scroll { 521sub map_scroll {
315 my ($self, $dx, $dy) = @_; 522 my ($self, $dx, $dy) = @_;
316 523
… …
318} 525}
319 526
320sub feed_map1a { 527sub feed_map1a {
321 my ($self, $data) = @_; 528 my ($self, $data) = @_;
322 529
323 $self->{map}->map1a_update ($data); 530 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
324 $self->{map_widget}->update; 531 $self->{map_widget}->update;
325} 532}
326 533
327sub magicmap { 534sub magicmap {
328 my ($self, $w, $h, $x, $y, $data) = @_; 535 my ($self, $w, $h, $x, $y, $data) = @_;
… …
337 or return; 544 or return;
338 545
339 my ($hash, $x, $y, $w, $h) = @$map_info; 546 my ($hash, $x, $y, $w, $h) = @$map_info;
340 547
341 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 548 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
342 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 549 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
343 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 550 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
344} 551}
345 552
346sub map_clear { 553sub map_clear {
347 my ($self) = @_; 554 my ($self) = @_;
… …
351 558
352 $self->{map}->clear; 559 $self->{map}->clear;
353 delete $self->{map_widget}{magicmap}; 560 delete $self->{map_widget}{magicmap};
354} 561}
355 562
563sub bg_fetch {
564 my ($self) = @_;
565
566 my $id;
567
568 do {
569 $id = pop @{$self->{bg_fetch}}
570 or return;
571 } while $self->{texture}[$id];
572
573 CFPlus::DB::get tilecache => $id, sub {
574 my ($data) = @_;
575
576 return unless $self->{map}; # stop when destroyed
577
578 $self->set_texture ($id => $data)
579 if defined $data;
580
581 $self->bg_fetch;
582 };
583}
356 584
357sub load_map($$$) { 585sub load_map($$$) {
358 my ($self, $hash, $x, $y) = @_; 586 my ($self, $hash, $x, $y) = @_;
359 587
360 if (defined (my $data = $self->{mapcache}->get ($hash))) { 588 my $gen = $self->{map_change_gen};
589
590 CFPlus::DB::get $self->{mapcache} => $hash, sub {
591 return unless $gen == $self->{map_change_gen};
592
593 my ($data) = @_;
594
595 if (defined $data) {
361 $data = Compress::LZF::decompress $data; 596 $data = Compress::LZF::decompress $data;
362 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 597 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
363 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
364 my $data = $self->{tilecache}->get ($id)
365 or next;
366 598
367 $self->set_texture ($id => $data); 599 my $inprogress = @{ $self->{bg_fetch} || [] };
600 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
601 $self->bg_fetch unless $inprogress;
368 } 602 }
369 } 603 };
370} 604}
371 605
372# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 606# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
373# (server resource,s latency, bandwidth), so this hack is warranted. 607# (server resource,s latency, bandwidth), so this hack is warranted.
374# the right fix is to make real tiled maps with an overview file 608# the right fix is to make real tiled maps with an overview file
… …
438 672
439 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 673 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
440 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 674 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
441 675
442 } else { 676 } else {
677 my $gen = $self->{map_change_gen};
443 $self->send_mapinfo ("spatial $path$tile", sub { 678 $self->send_mapinfo ("spatial $path$tile", sub {
679 return unless $gen == $self->{map_change_gen};
680
444 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 681 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
445 682
446 return if $mode ne "spatial"; 683 return if $mode ne "spatial";
447 684
448 $x += $self->{map}->ox; 685 $x += $self->{map}->ox;
… …
462 699
463sub map_change { 700sub map_change {
464 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 701 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 702
466 $self->flush_map; 703 $self->flush_map;
704
705 ++$self->{map_change_gen};
467 706
468 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 707 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
469 708
470 my $mapmapw = $self->{mapmap}->{w}; 709 my $mapmapw = $self->{mapmap}->{w};
471 my $mapmaph = $self->{mapmap}->{h}; 710 my $mapmaph = $self->{mapmap}->{h};
… …
488 $self->load_map ($hash, $x, $y); 727 $self->load_map ($hash, $x, $y);
489 $self->flood_fill (0, 0, 0, "", $hash, $flags); 728 $self->flood_fill (0, 0, 0, "", $hash, $flags);
490} 729}
491 730
492sub face_find { 731sub face_find {
493 my ($self, $facenum, $face) = @_; 732 my ($self, $facenum, $face, $cb) = @_;
494 733
495 my $hash = "$face->{chksum},$face->{name}"; 734 my $hash = "$face->{chksum},$face->{name}";
496 735
497 my $id = $self->{facemap}->get ($hash); 736 my $id = CFPlus::DB::get_tile_id_sync $hash;
498 737
499 unless ($id) {
500 # create new id for face
501 # I love transactions
502 for (1..100) {
503 my $txn = $CFClient::DB_ENV->txn_begin;
504 my $status = $self->{facemap}->db_get (id => $id);
505 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
506 $id = ($id || 64) + 1;
507 if ($self->{facemap}->put (id => $id) == 0
508 && $self->{facemap}->put ($hash => $id) == 0) {
509 $txn->txn_commit;
510
511 goto gotid;
512 }
513 }
514 $txn->txn_abort;
515 }
516
517 CFClient::fatal "maximum number of transaction retries reached - database problems?";
518 }
519
520gotid:
521 $face->{id} = $id; 738 $face->{id} = $id;
522 $self->{map}->set_face ($facenum => $id);
523 $self->{faceid}[$facenum] = $id;#d# 739 $self->{faceid}[$facenum] = $id;
524 740
525 my $face = $self->{tilecache}->get ($id); 741 $self->{map}->set_tileid ($facenum => $id);
526 742
527 if ($face) { 743 CFPlus::DB::get tilecache => $id, $cb;
528 #$self->face_prefetch;
529 $face
530 } else {
531 my $tex = $self->{noface};
532 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
533 undef
534 };
535} 744}
536 745
537sub face_update { 746sub face_update {
538 my ($self, $facenum, $face, $changed) = @_; 747 my ($self, $facenum, $face, $changed) = @_;
539 748
540 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 749 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
750 if $changed;
541 751
542 $self->set_texture ($face->{id} => delete $face->{image}); 752 $self->set_texture ($face->{id} => delete $face->{image});
753}
754
755sub smooth_update {
756 my ($self, $facenum, $face) = @_;
757
758 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
543} 759}
544 760
545sub set_texture { 761sub set_texture {
546 my ($self, $id, $data) = @_; 762 my ($self, $id, $data) = @_;
547 763
764 return unless $self->{map};
765
548 $self->{texture}[$id] ||= do { 766 $self->{texture}[$id] = my $tex =
549 my $tex =
550 new_from_image CFClient::Texture 767 new_from_image CFPlus::Texture
551 $data, minify => 1, mipmap => 1; 768 $data, minify => 1, mipmap => 1;
552 769
553 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 770 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
554 $self->{map_widget}->update; 771 $self->{map_widget}->update;
555
556 $tex
557 };
558} 772}
559 773
560sub sound_play { 774sub sound_play {
561 my ($self, $x, $y, $soundnum, $type) = @_; 775 my ($self, $x, $y, $soundnum, $type) = @_;
562 776
… …
572 $LAST_QUERY = $prompt; 786 $LAST_QUERY = $prompt;
573 787
574 $self->{query}-> ($self, $flags, $prompt); 788 $self->{query}-> ($self, $flags, $prompt);
575} 789}
576 790
577sub drawinfo { 791sub sanitise_xml($) {
578 my ($self, $color, $text) = @_; 792 local $_ = shift;
579 793
580 my @color = ( 794 # we now weed out all tags we do not support
795 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
796 # now all entities
797 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
798
799 # handle some elements
800 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
801 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
802
803 $_
804}
805
806our %NAME_TO_COLOR = (
807 black => 0,
808 white => 1,
809 darkblue => 2,
810 red => 3,
811 orange => 4,
812 lightblue => 5,
813 darkorange => 6,
814 green => 7,
815 darkgreen => 8,
816 grey => 9,
817 brown => 10,
818 yellow => 11,
819 tan => 12,
820);
821
822our @CF_COLOR = (
581 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 823 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
582 [1.00, 1.00, 1.00], 824 [1.00, 1.00, 1.00],
583 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 825 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
584 [1.00, 0.00, 0.00], 826 [1.00, 0.00, 0.00],
585 [1.00, 0.54, 0.00], 827 [1.00, 0.54, 0.00],
586 [0.11, 0.56, 1.00], 828 [0.11, 0.56, 1.00],
587 [0.93, 0.46, 0.00], 829 [0.93, 0.46, 0.00],
588 [0.18, 0.54, 0.34], 830 [0.18, 0.54, 0.34],
589 [0.56, 0.73, 0.56], 831 [0.56, 0.73, 0.56],
590 [0.80, 0.80, 0.80], 832 [0.80, 0.80, 0.80],
591 [0.75, 0.61, 0.20], 833 [0.75, 0.61, 0.20],
592 [0.99, 0.77, 0.26], 834 [0.99, 0.77, 0.26],
593 [0.74, 0.65, 0.41], 835 [0.74, 0.65, 0.41],
594 ); 836);
595 837
838sub msg {
839 my ($self, $color, $type, $text, @extra) = @_;
840
841 $text = sanitise_xml $text;
842
843 if (my $cb = $self->{cb_msg}{$type}) {
844 $_->($self, $color, $type, $text, @extra) for values %$cb;
845 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
846 $type =~ s/-/_/g;
847 $self->{$type} = $text;
848 } else {
596 $self->logprint ("info: ", $text); 849 $self->logprint ("msg: ", $text);
850 return if $color < 0; # negative color == ignore if not understood
597 851
598 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 852 my $fg = $CF_COLOR[$color % @CF_COLOR];
599 853
600 # try to create single paragraphs of multiple lines sent by the server 854 ## try to create single paragraphs of multiple lines sent by the server
855 # no longer neecssary with TRT servers
601 $text =~ s/(?<=\S)\n(?=\w)/ /g; 856 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
602 857
603 $text = CFClient::asxml $text; 858 ::message ({ fg => $fg, markup => $_ })
604 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 859 for split /\n/, $text;
605 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
606 860
607 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
608 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
609 $self->{logview}->scroll_to_bottom;
610
611 $self->{statusbox}->add ($text, 861 $self->{statusbox}->add ($text,
612 group => $text, 862 group => $text,
613 fg => $color[$color], 863 fg => $fg,
614 timeout => $color >= 2 ? 60 : 10, 864 timeout => $color >= 2 ? 180 : 10,
615 tooltip_font => $::FONT_FIXED, 865 tooltip_font => $::FONT_FIXED,
616 ); 866 );
617} 867 }
618
619sub drawextinfo {
620 my ($self, $color, $type, $subtype, $message) = @_;
621
622 $self->drawinfo ($color, $message);
623} 868}
624 869
625sub spell_add { 870sub spell_add {
626 my ($self, $spell) = @_; 871 my ($self, $spell) = @_;
627 872
628 # try to create single paragraphs out of the multiple lines sent by the server 873 # try to create single paragraphs out of the multiple lines sent by the server
629 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 874 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
630 $spell->{message} =~ s/\n+$//; 875 $spell->{message} =~ s/\n+$//;
631 $spell->{message} ||= "Server did not provide a description for this spell."; 876 $spell->{message} ||= "Server did not provide a description for this spell.";
632 877
633 $::SPELL_PAGE->add_spell ($spell); 878 $::SPELL_LIST->add_spell ($spell);
634 879
635 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message}); 880 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
636 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message}); 881 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
637} 882}
638 883
639sub spell_delete { 884sub spell_delete {
640 my ($self, $spell) = @_; 885 my ($self, $spell) = @_;
641 886
642 $::SPELL_PAGE->remove_spell ($spell); 887 $::SPELL_LIST->remove_spell ($spell);
888}
889
890sub setup {
891 my ($self, $setup) = @_;
892
893 $self->{map_widget}->set_tilesize ($self->{tilesize});
894 $::MAP->resize ($self->{mapw}, $self->{maph});
643} 895}
644 896
645sub addme_success { 897sub addme_success {
646 my ($self) = @_; 898 my ($self) = @_;
647 899
648 my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
649 my ($pom) = @_;
650
651 my %skill_help; 900 my %skill_help;
652 901
653 for my $head2 ($pom->head1->[3]->head2) { 902 for my $node (CFPlus::Pod::find skill_description => "*") {
654 $skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content; 903 my (undef, @par) = CFPlus::Pod::section_of $node;
655 } 904 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
656
657 \%skill_help
658 }; 905 };
659 906
660 for my $skill (values %{$self->{skill_info}}) { 907 for my $skill (values %{$self->{skill_info}}) {
661 $self->{map_widget}->add_command ("ready_skill $skill", 908 $self->{map_widget}->add_command ("ready_skill $skill",
662 (CFClient::asxml "Ready the skill '$skill'\n\n") 909 (CFPlus::asxml "Ready the skill '$skill'\n\n")
663 . $skill_help->{$skill}); 910 . $skill_help{$skill});
664 $self->{map_widget}->add_command ("use_skill $skill", 911 $self->{map_widget}->add_command ("use_skill $skill",
665 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 912 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
666 . $skill_help->{$skill}); 913 . $skill_help{$skill});
667 } 914 }
668} 915}
669 916
670sub eof { 917sub eof {
671 my ($self) = @_; 918 my ($self) = @_;
… …
695 942
696 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 943 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
697 944
698 $self->send ("requestinfo image_sums $face $face"); 945 $self->send ("requestinfo image_sums $face $face");
699 946
700 $self->{statusbox}->add (CFClient::asxml "prefetching $todo", 947 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
701 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 948 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
702 } elsif (!exists $self->{num_faces}) { 949 } elsif (!exists $self->{num_faces}) {
703 $self->send ("requestinfo image_info"); 950 $self->send ("requestinfo image_info");
704 951
705 $self->{num_faces} = 0; 952 $self->{num_faces} = 0;
706 953
707 $self->{statusbox}->add (CFClient::asxml "starting to prefetch", 954 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
708 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 955 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
709 } 956 }
710} 957}
711 958
712sub update_floorbox { 959sub update_floorbox {
713 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 960 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
714 return unless $::CONN; 961 return unless $::CONN;
715 962
716 $::FLOORBOX->clear; 963 $::FLOORBOX->clear;
717 964
718 my $row; 965 my $row;
719 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 966 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
720 if ($row < 6) { 967 if ($row < 6) {
721 local $_->{face_widget}; # hack to force recreation of widget 968 local $_->{face_widget}; # hack to force recreation of widget
722 local $_->{desc_widget}; # hack to force recreation of widget 969 local $_->{desc_widget}; # hack to force recreation of widget
723 CFClient::Item::update_widgets $_; 970 CFPlus::Item::update_widgets $_;
724 971
725 $::FLOORBOX->add (0, $row, $_->{face_widget}); 972 $::FLOORBOX->add (0, $row, $_->{face_widget});
726 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 973 $::FLOORBOX->add (1, $row, $_->{desc_widget});
727 974
728 $row++; 975 $row++;
729 } else { 976 } else {
730 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 977 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
731 text => "More...", 978 text => "More...",
732 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 979 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
733 ); 980 );
734 last; 981 last;
735 } 982 }
736 } 983 }
737 if ($::CONN->{open_container}) { 984 if ($::CONN->{open_container}) {
738 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 985 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
739 text => "Close container", 986 text => "Close container",
740 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 987 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
741 ); 988 );
742 } 989 }
743 }); 990 });
… …
749 my ($conn, $tag, $name) = @_; 996 my ($conn, $tag, $name) = @_;
750 $conn->{open_container} = $tag; 997 $conn->{open_container} = $tag;
751 update_floorbox; 998 update_floorbox;
752 999
753 $::INV_RIGHT_HB->clear (); 1000 $::INV_RIGHT_HB->clear ();
754 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1001 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
755 1002
756 if ($tag != 0) { # Floor isn't closable, is it? 1003 if ($tag != 0) { # Floor isn't closable, is it?
757 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1004 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
758 text => "Close container", 1005 text => "Close container",
759 tooltip => "Close the currently open container (if one is open)", 1006 tooltip => "Close the currently open container (if one is open)",
760 on_activate => sub { 1007 on_activate => sub {
761 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1008 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
762 if $tag != 0; 1009 if $tag != 0;
… …
770} 1017}
771 1018
772sub update_containers { 1019sub update_containers {
773 my ($self) = @_; 1020 my ($self) = @_;
774 1021
775 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1022 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
776 my $todo = delete $self->{update_container} 1023 my $todo = delete $self->{update_container}
777 or return; 1024 or return;
778 1025
779 for my $tag (keys %$todo) { 1026 for my $tag (keys %$todo) {
780 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1027 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
817sub item_update { 1064sub item_update {
818 my ($self, $item) = @_; 1065 my ($self, $item) = @_;
819 1066
820 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1067 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
821 1068
822 CFClient::Item::update_widgets $item; 1069 CFPlus::Item::update_widgets $item;
823 1070
824 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1071 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
825 set_opencont ($::CONN, 0, "Floor"); 1072 set_opencont ($::CONN, 0, "Floor");
826 1073
827 } elsif ($item->{flags} & F_OPEN) { 1074 } elsif ($item->{flags} & F_OPEN) {
828 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1075 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
829 1076
830 } else { 1077 } else {
831 $self->{update_container}{$item->{container}}++; 1078 $self->{update_container}{$item->{container}}++;
832 $self->update_containers; 1079 $self->update_containers;
833 } 1080 }
… …
858 $::SERVER_INFO->set_markup ( 1105 $::SERVER_INFO->set_markup (
859 "server <tt>$self->{host}:$self->{port}</tt>\n" 1106 "server <tt>$self->{host}:$self->{port}</tt>\n"
860 . "protocol version <tt>$self->{version}</tt>\n" 1107 . "protocol version <tt>$self->{version}</tt>\n"
861 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1108 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
862 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1109 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1110 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1111 . "editing support $yesno[!!$self->{editor_support}]\n"
1112 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1113 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
863 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1114 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
864 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1115 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
865 . "map size $self->{mapw}×$self->{maph}\n" 1116 . "map size $self->{mapw}×$self->{maph}\n"
866 ); 1117 );
1118
1119 ::setup_build_button ($self->{editor_support}->{builder_ui});
867} 1120}
868 1121
869sub logged_in { 1122sub logged_in {
870 my ($self) = @_; 1123 my ($self) = @_;
871 1124
872 $self->send_ext_req (cfplus_support => "1", sub { 1125 $self->send_ext_req (cfplus_support => version => 1, sub {
873 $self->{cfplus_ext} = $_[0]; 1126 $self->{cfplus_ext} = $_[0]{version};
874 $self->update_server_info; 1127 $self->update_server_info;
1128
1129 if ($self->{cfplus_ext} >= 2) {
1130 $self->send_ext_req ("editor_support", sub {
1131 $self->{editor_support} = $_[0];
1132 $self->update_server_info;
1133
1134 0
1135 });
1136 }
1137
1138 0
875 }); 1139 });
876 1140
877 $self->update_server_info; 1141 $self->update_server_info;
878 1142
879 $self->send_command ("output-sync $::CFG->{output_sync}"); 1143 $self->send_command ("output-sync $::CFG->{output_sync}");
880 $self->send_command ("output-count $::CFG->{output_count}"); 1144 $self->send_command ("output-count $::CFG->{output_count}");
1145 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
881 $self->send_command ("pickup $::CFG->{pickup}"); 1146 $self->send_command ("pickup $::CFG->{pickup}");
1147}
1148
1149sub buildat {
1150 my ($self, $builditem, $x, $y) = @_;
1151
1152 if ($self->{cfplus_ext}) {
1153 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1154 }
882} 1155}
883 1156
884sub lookat { 1157sub lookat {
885 my ($self, $x, $y) = @_; 1158 my ($self, $x, $y) = @_;
886 1159
887 if ($self->{cfplus_ext}) { 1160 if ($self->{cfplus_ext}) {
888 $self->send_ext_req (lookat => "$x $y", sub { 1161 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
889 my %res = split /\x00/, $_[0]; 1162 my ($msg) = @_;
890 1163
891 if (exists $res{npc_dialog}) { 1164 if (exists $msg->{npc_dialog}) {
892 # start npc chat dialog 1165 # start npc chat dialog
893 $self->{npc_dialog} = new CFClient::NPCDialog:: 1166 $self->{npc_dialog} = new CFPlus::NPCDialog::
894 dx => $x, 1167 dx => $x,
895 dy => $y, 1168 dy => $y,
896 title => "$res{npc_dialog} (NPC)", 1169 title => "$msg->{npc_dialog} (NPC)",
897 conn => $self, 1170 conn => $self,
898 ; 1171 ;
899 } 1172 }
900 }); 1173 });
901 } 1174 }
… …
904} 1177}
905 1178
906sub destroy { 1179sub destroy {
907 my ($self) = @_; 1180 my ($self) = @_;
908 1181
909 $self->{npc_dialog}->destroy 1182 (delete $self->{npc_dialog})->destroy
910 if $self->{npc_dialog}; 1183 if $self->{npc_dialog};
911 1184
912 $self->SUPER::destroy; 1185 $self->SUPER::destroy;
913}
914 1186
1187 %$self = ();
1188}
1189
915package CFClient::NPCDialog; 1190package CFPlus::NPCDialog;
916 1191
917our @ISA = 'CFClient::UI::FancyFrame'; 1192our @ISA = 'CFPlus::UI::Toplevel';
918 1193
919sub new { 1194sub new {
920 my $class = shift; 1195 my $class = shift;
921 1196
922 my $self = $class->SUPER::new ( 1197 my $self = $class->SUPER::new (
… …
929 kw => { hi => 0, yes => 0, no => 0 }, 1204 kw => { hi => 0, yes => 0, no => 0 },
930 has_close_button => 1, 1205 has_close_button => 1,
931 @_, 1206 @_,
932 ); 1207 );
933 1208
934 Scalar::Util::weaken (my $this = $self); 1209 CFPlus::weaken (my $this = $self);
935 1210
936 $self->connect (delete => sub { $this->destroy; 1 }); 1211 $self->connect (delete => sub { $this->destroy; 1 });
937 1212
938 # better use a pane... 1213 # better use a pane...
939 $self->add (my $hbox = new CFClient::UI::HBox); 1214 $self->add (my $hbox = new CFPlus::UI::HBox);
940 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1215 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
941 1216
942 $hbox->add (my $vbox = new CFClient::UI::VBox); 1217 $hbox->add (my $vbox = new CFPlus::UI::VBox);
943 1218
944 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1219 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
945 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1220 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
946 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1221 tooltip => "#npc_message_entry",
947 . "Sometimes you have to tell an NPC something you cannot find out during "
948 . "a normal conversation (such as a password). In those cases you have to use "
949 . "this text entry. You can also enter responses manually instead of using the response "
950 . "buttons below.",
951 on_activate => sub { 1222 on_activate => sub {
952 my ($entry, $text) = @_; 1223 my ($entry, $text) = @_;
953 1224
954 return unless $text =~ /\S/; 1225 return unless $text =~ /\S/;
955 1226
… …
958 1229
959 0 1230 0
960 }, 1231 },
961 ); 1232 );
962 1233
963 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1234 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
964 1235
965 $self->{bye_button} = new CFClient::UI::Button 1236 $self->{bye_button} = new CFPlus::UI::Button
966 text => "Bye (close)", 1237 text => "Bye (close)",
967 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1238 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
968 on_activate => sub { $this->destroy; 1 }, 1239 on_activate => sub { $this->destroy; 1 },
969 ; 1240 ;
970 1241
971 $self->update_options; 1242 $self->update_options;
972 1243
973 $self->{token} = $self->{conn}->ext_token; 1244 $self->{id} = $self->{conn}->send_ext_req (
974 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1245 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
975 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1246 sub { $this && $this->feed (@_) }
1247 );
976 1248
977 $self->{entry}->grab_focus; 1249 $self->{entry}->grab_focus;
978 1250
979 $self->{textview}->add_paragraph ({ 1251 $self->{textview}->add_paragraph ({
980 fg => [1, 1, 0, 1], 1252 fg => [1, 1, 0, 1],
… …
986}; 1258};
987 1259
988sub update_options { 1260sub update_options {
989 my ($self) = @_; 1261 my ($self) = @_;
990 1262
991 Scalar::Util::weaken $self; 1263 CFPlus::weaken $self;
992 1264
993 $self->{options}->clear; 1265 $self->{options}->clear;
994 $self->{options}->add ($self->{bye_button}); 1266 $self->{options}->add ($self->{bye_button});
995 1267
996 for my $kw (sort keys %{ $self->{kw} }) { 1268 for my $kw (sort keys %{ $self->{kw} }) {
997 $self->{options}->add (new CFClient::UI::Button 1269 $self->{options}->add (new CFPlus::UI::Button
998 text => $kw, 1270 text => $kw,
999 on_activate => sub { 1271 on_activate => sub {
1000 $self->send ($kw); 1272 $self->send ($kw);
1001 0 1273 0
1002 }, 1274 },
1003 ); 1275 );
1004 } 1276 }
1005} 1277}
1006 1278
1007sub feed { 1279sub feed {
1008 my ($self, $data) = @_; 1280 my ($self, $msg) = @_;
1009 1281
1010 Scalar::Util::weaken $self; 1282 CFPlus::weaken $self;
1011 1283
1012 my ($type, $msg) = split / /, $data, 2; 1284 if ($msg->{msgtype} eq "reply") {
1285 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1286 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1013 1287
1014 if ($type eq "msg") { 1288 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1015 my ($msg, @kw) = split /\x00/, $msg;
1016
1017 utf8::decode $_ for ($msg, @kw);
1018
1019 $self->{kw}{$_} = 1 for @kw;
1020
1021 $msg = "\n" . CFClient::UI::asxml $msg;
1022 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1289 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1023 my @link; 1290 my @link;
1024 $msg =~ s{ 1291 $text =~ s{
1025 ($match) 1292 ($match)
1026 }{ 1293 }{
1027 my $kw = $1; 1294 my $kw = $1;
1028 1295
1029 push @link, new CFClient::UI::Label 1296 push @link, new CFPlus::UI::Label
1030 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1297 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1031 can_hover => 1, 1298 can_hover => 1,
1032 can_events => 1, 1299 can_events => 1,
1033 padding_x => 0, 1300 padding_x => 0,
1034 padding_y => 0, 1301 padding_y => 0,
1035 on_button_up => sub { 1302 on_button_up => sub {
1036 $self->send ($kw); 1303 $self->send ($kw);
1037 }; 1304 };
1038 1305
1039 chr 0xfffc 1306 "\x{fffc}"
1040 }giex; 1307 }giex;
1041 1308
1042 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1309 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1043 $self->{textview}->scroll_to_bottom; 1310 $self->{textview}->scroll_to_bottom;
1044 $self->update_options; 1311 $self->update_options;
1045 } else { 1312 } else {
1046 $self->destroy; 1313 $self->destroy;
1047 } 1314 }
… …
1050} 1317}
1051 1318
1052sub send { 1319sub send {
1053 my ($self, $msg) = @_; 1320 my ($self, $msg) = @_;
1054 1321
1055 $self->{textview}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg }); 1322 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1056 $self->{textview}->scroll_to_bottom; 1323 $self->{textview}->scroll_to_bottom;
1057 1324
1058 utf8::encode $msg; 1325 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1059 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1060} 1326}
1061 1327
1062sub destroy { 1328sub destroy {
1063 my ($self) = @_; 1329 my ($self) = @_;
1064 1330
1065 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1331 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1066 1332
1333 if ($self->{conn}) {
1067 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1334 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1068 delete $self->{conn}{npc_dialog}; 1335 delete $self->{conn}{npc_dialog};
1069 $self->{conn}->disconnect_ext ($self->{token}); 1336 $self->{conn}->disconnect_ext ($self->{id});
1337 }
1070 1338
1071 $self->SUPER::destroy; 1339 $self->SUPER::destroy;
1072} 1340}
1073 1341
10741 13421
1343

Diff Legend

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