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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines