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.68 by elmex, Sun Jul 30 12:51:32 2006 UTC vs.
Revision 1.115 by root, Thu Jul 12 19:10:52 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 resmap => $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 resmap => $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 use Data::Dumper;
98 warn Dumper $self->{songs};#d#
99 }
100 });
101
102 $self->connect_ext (event_capabilities => sub {
103 my ($cap) = @_;
104
105 if (my $ts = $cap->{tileset}) {
106 if (my ($default) = grep $_->[2] & 1, @$ts) {
107 $self->{tileset} = $default;
108 $self->{tilesize} = $default->[3];
109 $self->setup_req (tileset => $default->[0]);
110
111 my $w = int $self->{mapw} * 32 / $self->{tilesize};
112 my $h = int $self->{maph} * 32 / $self->{tilesize};
113
114 $self->setup_req (mapsize => "${w}x${h}");
115 }
116 }
117 });
118
119 $self->{json_coder}
120 ->convert_blessed
121 ->filter_json_single_key_object (__widget_ref__ => sub {
122 $self->{widget}{$_[0]}
123 });
124
125 $self->connect_ext (ws_n => sub {
126 my ($arg) = @_;
127
128 $self->{widgetset}{$arg{id}} = {
129 w => {},
42 } 130 };
43
44 \@cmd_help
45 }; 131 });
132
133 $self->connect_ext (ws_d => sub {
134 my ($arg) = @_;
135
136 my $ws = delete $self->{widgetset}{$arg{id}}
137 or return;
138
139 $_->destroy
140 for values %{$ws->{w}};
141 });
142
143 $self->connect_ext (ws_c => sub {
144 my ($arg) = @_;
145
146 my $args = $arg->{args} || {};
147
148 for my $ev (grep /^on_/, keys %$args) {
149 $args->{$ev} = sub {
150 my $id = shift->{s_id};
151 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
152
153 1
154 };
155 }
156
157 if (my $widget = eval {
158 local $SIG{__DIE__};
159 "CFPlus::UI::$arg->{class}"->new (
160 %$args,
161 s_ws => $arg->{ws},
162 s_id => $arg->{id},
163 )
164 }
165 ) {
166 $self->{widget}{$arg->{id}}
167 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
168 = $widget;
169
170 $widget->connect (on_destroy => sub {
171 my ($widget) = @_;
172
173 delete $self->{widget}{$widget->{s_id}};
174 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
175 });
176 } else {
177 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
178 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
179 }
180 });
181
182 $self->connect_ext (w_c => sub {
183 my ($arg) = @_;
184
185 my $w = $self->{widget}{$arg->{id}}
186 or return;
187 my $m = $arg->{name};
188
189 my $a = $arg->{args} || [];
190
191 if (exists $arg->{rid}) {
192 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
193 } else {
194 $w->$m (@$a);
195 }
196 });
197
198 $self->connect_ext (w_s => sub {
199 my ($arg) = @_;
200
201 my $w = $self->{widget}{$arg->{id}}
202 or return;
203
204 $w->{$arg->{name}} = $arg->{value};
205 });
206
207 $self->connect_ext (w_g => sub {
208 my ($arg) = @_;
209
210 my $w = $self->{widget}{$arg->{id}}
211 or return;
212
213 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
214 });
215
216 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
217 for my $ws (values %{delete $self->{widgetset} || {}}) {
218 $_->destroy
219 for values %{delete $ws->{w} || {}};
220 }
221 });
46 222
47 $self->{map_widget}->add_command (@$_) 223 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 224 for @cmd_help;
49 225
226 {
227 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
228 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
229 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
230 }
231
232 {
50 $self->{noface} = new_from_file CFClient::Texture 233 $self->{noface} = my $tex = new_from_file CFPlus::Texture
51 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 234 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
235 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
236 }
52 237
53 $self->{open_container} = 0; 238 $self->{open_container} = 0;
54 239
55 # "global"
56 $self->{tilecache} = CFClient::db_table "tilecache";
57 $self->{facemap} = CFClient::db_table "facemap";
58
59 # per server 240 # per server
60 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 241 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
61 242
62 $self 243 $self
63} 244}
64 245
65sub logprint { 246sub logprint {
… …
222 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 403 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
223 $::GAUGES->{food} ->set_value ($fo, $fo_m); 404 $::GAUGES->{food} ->set_value ($fo, $fo_m);
224 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 405 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
225 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 406 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
226 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 407 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
227 my $rng = $stats->{+CS_STAT_RANGE}; 408 $::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}; 409 my $title = $stats->{+CS_STAT_TITLE};
231 $title =~ s/^Player: //; 410 $title =~ s/^Player: //;
232 $::STATWIDS->{title} ->set_text ("Title: " . $title); 411 $::STATWIDS->{title} ->set_text ("Title: " . $title);
233 412
234 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 413 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
254 my @skills = keys %{ $self->{skill_info} }; 433 my @skills = keys %{ $self->{skill_info} };
255 434
256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 435 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
257 $sktbl->clear; 436 $sktbl->clear;
258 437
259 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 438 $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); 439 $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); 440 $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); 441 $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); 442 $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); 443 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
265 444
266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 445 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267 446
268 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 447 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); 448 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 449
272 my ($x, $y) = (0, 1); 450 my ($x, $y) = (0, 1);
273 for ( 451 for (
274 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 452 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
275 map [$_, $self->{skill_info}{$_}], 453 map [$_, $self->{skill_info}{$_}],
… …
284 if ($ev->{button} == 1) { 462 if ($ev->{button} == 1) {
285 $::CONN->user_send ("ready_skill $name"); 463 $::CONN->user_send ("ready_skill $name");
286 } elsif ($ev->{button} == 2) { 464 } elsif ($ev->{button} == 2) {
287 $::CONN->user_send ("use_skill $name"); 465 $::CONN->user_send ("use_skill $name");
288 } elsif ($ev->{button} == 3) { 466 } elsif ($ev->{button} == 3) {
467 my $shortname = CFPlus::shorten $name, 14;
289 (new CFClient::UI::Menu 468 (new CFPlus::UI::Menu
290 items => [ 469 items => [
291 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 470 ["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"]) }], 471 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
293 ], 472 ],
294 )->popup ($ev); 473 )->popup ($ev);
295 } else { 474 } else {
296 return 0; 475 return 0;
297 } 476 }
298 477
299 1 478 1
300 }; 479 };
301 480
302 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 481 $sktbl->add ($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); 482 text => "0", 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 CFClient::UI::Label 483 $sktbl->add ($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); 484 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 CFClient::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 485 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
486 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
307 487
308 $x++ and ($x, $y) = (0, $y + 1); 488 $x++ and ($x, $y) = (0, $y + 1);
309 } 489 }
310 } 490 }
311 491
… …
313 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 493 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
314 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 494 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
315 } 495 }
316} 496}
317 497
498sub macro_send {
499 my ($self, $macro) = @_;
500
501 for my $cmd (@{ $macro->{action} }) {
502 $self->send_command ($cmd);
503 }
504}
505
318sub user_send { 506sub user_send {
319 my ($self, $command) = @_; 507 my ($self, $command) = @_;
320 508
509 $self->{record}->($command)
321 if ($self->{record}) { 510 if $self->{record};
322 push @{$self->{record}}, $command;
323 }
324 511
325 $self->logprint ("send: ", $command); 512 $self->logprint ("send: ", $command);
326 $self->send_command ($command); 513 $self->send_command ($command);
327 ::status ($command); 514 ::status ($command);
328} 515}
329 516
330sub start_record { 517sub record {
331 my ($self) = @_; 518 my ($self, $cb) = @_;
332 519
333 $self->{record} = []; 520 $self->{record} = $cb;
334}
335
336sub stop_record {
337 my ($self) = @_;
338 return delete $self->{record};
339} 521}
340 522
341sub map_scroll { 523sub map_scroll {
342 my ($self, $dx, $dy) = @_; 524 my ($self, $dx, $dy) = @_;
343 525
… …
345} 527}
346 528
347sub feed_map1a { 529sub feed_map1a {
348 my ($self, $data) = @_; 530 my ($self, $data) = @_;
349 531
350 $self->{map}->map1a_update ($data); 532 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
351 $self->{map_widget}->update; 533 $self->{map_widget}->update;
352} 534}
353 535
354sub magicmap { 536sub magicmap {
355 my ($self, $w, $h, $x, $y, $data) = @_; 537 my ($self, $w, $h, $x, $y, $data) = @_;
… …
364 or return; 546 or return;
365 547
366 my ($hash, $x, $y, $w, $h) = @$map_info; 548 my ($hash, $x, $y, $w, $h) = @$map_info;
367 549
368 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 550 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
369 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 551 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
370 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 552 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
371} 553}
372 554
373sub map_clear { 555sub map_clear {
374 my ($self) = @_; 556 my ($self) = @_;
… …
378 560
379 $self->{map}->clear; 561 $self->{map}->clear;
380 delete $self->{map_widget}{magicmap}; 562 delete $self->{map_widget}{magicmap};
381} 563}
382 564
565sub bg_fetch {
566 my ($self) = @_;
567
568 my $id;
569
570 do {
571 $id = pop @{$self->{bg_fetch}}
572 or return;
573 } while $self->{texture}[$id];
574
575 CFPlus::DB::get tilecache => $id, sub {
576 my ($data) = @_;
577
578 return unless $self->{map}; # stop when destroyed
579
580 $self->set_texture ($id => $data)
581 if defined $data;
582
583 $self->bg_fetch;
584 };
585}
383 586
384sub load_map($$$) { 587sub load_map($$$) {
385 my ($self, $hash, $x, $y) = @_; 588 my ($self, $hash, $x, $y) = @_;
386 589
387 if (defined (my $data = $self->{mapcache}->get ($hash))) { 590 my $gen = $self->{map_change_gen};
591
592 CFPlus::DB::get $self->{mapcache} => $hash, sub {
593 return unless $gen == $self->{map_change_gen};
594
595 my ($data) = @_;
596
597 if (defined $data) {
388 $data = Compress::LZF::decompress $data; 598 $data = Compress::LZF::decompress $data;
389 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 599 #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 600
394 $self->set_texture ($id => $data); 601 my $inprogress = @{ $self->{bg_fetch} || [] };
602 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
603 $self->bg_fetch unless $inprogress;
395 } 604 }
396 } 605 };
397} 606}
398 607
399# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 608# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
400# (server resource,s latency, bandwidth), so this hack is warranted. 609# (server resource,s latency, bandwidth), so this hack is warranted.
401# the right fix is to make real tiled maps with an overview file 610# the right fix is to make real tiled maps with an overview file
… …
465 674
466 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 675 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
467 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 676 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
468 677
469 } else { 678 } else {
679 my $gen = $self->{map_change_gen};
470 $self->send_mapinfo ("spatial $path$tile", sub { 680 $self->send_mapinfo ("spatial $path$tile", sub {
681 return unless $gen == $self->{map_change_gen};
682
471 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 683 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
472 684
473 return if $mode ne "spatial"; 685 return if $mode ne "spatial";
474 686
475 $x += $self->{map}->ox; 687 $x += $self->{map}->ox;
… …
489 701
490sub map_change { 702sub map_change {
491 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 703 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
492 704
493 $self->flush_map; 705 $self->flush_map;
706
707 ++$self->{map_change_gen};
494 708
495 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 709 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
496 710
497 my $mapmapw = $self->{mapmap}->{w}; 711 my $mapmapw = $self->{mapmap}->{w};
498 my $mapmaph = $self->{mapmap}->{h}; 712 my $mapmaph = $self->{mapmap}->{h};
… …
515 $self->load_map ($hash, $x, $y); 729 $self->load_map ($hash, $x, $y);
516 $self->flood_fill (0, 0, 0, "", $hash, $flags); 730 $self->flood_fill (0, 0, 0, "", $hash, $flags);
517} 731}
518 732
519sub face_find { 733sub face_find {
520 my ($self, $facenum, $face) = @_; 734 my ($self, $facenum, $face, $cb) = @_;
521 735
522 my $hash = "$face->{chksum},$face->{name}"; 736 my $hash = "$face->{chksum},$face->{name}";
523 737
524 my $id = $self->{facemap}->get ($hash); 738 my $id = CFPlus::DB::get_tile_id_sync $hash;
525 739
526 unless ($id) {
527 # create new id for face
528 # I love transactions
529 for (1..100) {
530 my $txn = $CFClient::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 CFClient::fatal "maximum number of transaction retries reached - database problems?";
545 }
546
547gotid:
548 $face->{id} = $id; 740 $face->{id} = $id;
549 $self->{map}->set_face ($facenum => $id);
550 $self->{faceid}[$facenum] = $id;#d# 741 $self->{faceid}[$facenum] = $id;
551 742
552 my $face = $self->{tilecache}->get ($id); 743 $self->{map}->set_tileid ($facenum => $id);
553 744
554 if ($face) { 745 CFPlus::DB::get tilecache => $id, $cb;
555 #$self->face_prefetch;
556 $face
557 } else {
558 my $tex = $self->{noface};
559 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
560 undef
561 };
562} 746}
563 747
564sub face_update { 748sub face_update {
565 my ($self, $facenum, $face, $changed) = @_; 749 my ($self, $facenum, $face, $changed) = @_;
566 750
567 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 751 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
752 if $changed;
568 753
569 $self->set_texture ($face->{id} => delete $face->{image}); 754 $self->set_texture ($face->{id} => delete $face->{image});
755}
756
757sub smooth_update {
758 my ($self, $facenum, $face) = @_;
759
760 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
570} 761}
571 762
572sub set_texture { 763sub set_texture {
573 my ($self, $id, $data) = @_; 764 my ($self, $id, $data) = @_;
574 765
575 $self->{texture}[$id] ||= do { 766 $self->{texture}[$id] = my $tex =
576 my $tex =
577 new_from_image CFClient::Texture 767 new_from_image CFPlus::Texture
578 $data, minify => 1, mipmap => 1; 768 $data, minify => 1, mipmap => 1;
579 769
580 $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}});
581 $self->{map_widget}->update; 771 $self->{map_widget}->update;
582
583 $tex
584 };
585} 772}
586 773
587sub sound_play { 774sub sound_play {
588 my ($self, $x, $y, $soundnum, $type) = @_; 775 my ($self, $x, $y, $soundnum, $type) = @_;
589 776
… …
599 $LAST_QUERY = $prompt; 786 $LAST_QUERY = $prompt;
600 787
601 $self->{query}-> ($self, $flags, $prompt); 788 $self->{query}-> ($self, $flags, $prompt);
602} 789}
603 790
604sub drawinfo { 791sub sanitise_xml($) {
605 my ($self, $color, $text) = @_; 792 local $_ = shift;
606 793
607 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 = (
608 [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],
609 [1.00, 1.00, 1.00], 824 [1.00, 1.00, 1.00],
610 [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]
611 [1.00, 0.00, 0.00], 826 [1.00, 0.00, 0.00],
612 [1.00, 0.54, 0.00], 827 [1.00, 0.54, 0.00],
613 [0.11, 0.56, 1.00], 828 [0.11, 0.56, 1.00],
614 [0.93, 0.46, 0.00], 829 [0.93, 0.46, 0.00],
615 [0.18, 0.54, 0.34], 830 [0.18, 0.54, 0.34],
616 [0.56, 0.73, 0.56], 831 [0.56, 0.73, 0.56],
617 [0.80, 0.80, 0.80], 832 [0.80, 0.80, 0.80],
618 [0.75, 0.61, 0.20], 833 [0.75, 0.61, 0.20],
619 [0.99, 0.77, 0.26], 834 [0.99, 0.77, 0.26],
620 [0.74, 0.65, 0.41], 835 [0.74, 0.65, 0.41],
621 ); 836);
622 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 {
623 $self->logprint ("info: ", $text); 849 $self->logprint ("msg: ", $text);
850 return if $color < 0; # negative color == ignore if not understood
624 851
625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 852 my $fg = $CF_COLOR[$color % @CF_COLOR];
626 853
627 # 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
628 $text =~ s/(?<=\S)\n(?=\w)/ /g; 856 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
629 857
630 $text = CFClient::asxml $text; 858 ::message ({ fg => $fg, markup => $_ })
631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 859 for split /\n/, $text;
632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
633 860
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, 861 $self->{statusbox}->add ($text,
639 group => $text, 862 group => $text,
640 fg => $color[$color], 863 fg => $fg,
641 timeout => $color >= 2 ? 60 : 10, 864 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 865 tooltip_font => $::FONT_FIXED,
643 ); 866 );
644} 867 }
645
646sub drawextinfo {
647 my ($self, $color, $type, $subtype, $message) = @_;
648
649 $self->drawinfo ($color, $message);
650} 868}
651 869
652sub spell_add { 870sub spell_add {
653 my ($self, $spell) = @_; 871 my ($self, $spell) = @_;
654 872
655 # 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
656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 874 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
657 $spell->{message} =~ s/\n+$//; 875 $spell->{message} =~ s/\n+$//;
658 $spell->{message} ||= "Server did not provide a description for this spell."; 876 $spell->{message} ||= "Server did not provide a description for this spell.";
659 877
660 $::SPELL_PAGE->add_spell ($spell); 878 $::SPELL_LIST->add_spell ($spell);
661 879
662 $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});
663 $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});
664} 882}
665 883
666sub spell_delete { 884sub spell_delete {
667 my ($self, $spell) = @_; 885 my ($self, $spell) = @_;
668 886
669 $::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});
670} 895}
671 896
672sub addme_success { 897sub addme_success {
673 my ($self) = @_; 898 my ($self) = @_;
674 899
675 my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
676 my ($pom) = @_;
677
678 my %skill_help; 900 my %skill_help;
679 901
680 for my $head2 ($pom->head1->[3]->head2) { 902 for my $node (CFPlus::Pod::find skill_description => "*") {
681 $skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content; 903 my (undef, @par) = CFPlus::Pod::section_of $node;
682 } 904 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684 \%skill_help
685 }; 905 };
686 906
687 for my $skill (values %{$self->{skill_info}}) { 907 for my $skill (values %{$self->{skill_info}}) {
688 $self->{map_widget}->add_command ("ready_skill $skill", 908 $self->{map_widget}->add_command ("ready_skill $skill",
689 (CFClient::asxml "Ready the skill '$skill'\n\n") 909 (CFPlus::asxml "Ready the skill '$skill'\n\n")
690 . $skill_help->{$skill}); 910 . $skill_help{$skill});
691 $self->{map_widget}->add_command ("use_skill $skill", 911 $self->{map_widget}->add_command ("use_skill $skill",
692 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 912 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693 . $skill_help->{$skill}); 913 . $skill_help{$skill});
694 } 914 }
695} 915}
696 916
697sub eof { 917sub eof {
698 my ($self) = @_; 918 my ($self) = @_;
… …
722 942
723 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 943 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
724 944
725 $self->send ("requestinfo image_sums $face $face"); 945 $self->send ("requestinfo image_sums $face $face");
726 946
727 $self->{statusbox}->add (CFClient::asxml "prefetching $todo", 947 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
728 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 948 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
729 } elsif (!exists $self->{num_faces}) { 949 } elsif (!exists $self->{num_faces}) {
730 $self->send ("requestinfo image_info"); 950 $self->send ("requestinfo image_info");
731 951
732 $self->{num_faces} = 0; 952 $self->{num_faces} = 0;
733 953
734 $self->{statusbox}->add (CFClient::asxml "starting to prefetch", 954 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
735 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 955 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
736 } 956 }
737} 957}
738 958
739sub update_floorbox { 959sub update_floorbox {
740 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 960 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
741 return unless $::CONN; 961 return unless $::CONN;
742 962
743 $::FLOORBOX->clear; 963 $::FLOORBOX->clear;
744 964
745 my $row; 965 my $row;
746 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} }) {
747 if ($row < 6) { 967 if ($row < 6) {
748 local $_->{face_widget}; # hack to force recreation of widget 968 local $_->{face_widget}; # hack to force recreation of widget
749 local $_->{desc_widget}; # hack to force recreation of widget 969 local $_->{desc_widget}; # hack to force recreation of widget
750 CFClient::Item::update_widgets $_; 970 CFPlus::Item::update_widgets $_;
751 971
752 $::FLOORBOX->add (0, $row, $_->{face_widget}); 972 $::FLOORBOX->add (0, $row, $_->{face_widget});
753 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 973 $::FLOORBOX->add (1, $row, $_->{desc_widget});
754 974
755 $row++; 975 $row++;
756 } else { 976 } else {
757 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 977 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
758 text => "More...", 978 text => "More...",
759 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 979 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
760 ); 980 );
761 last; 981 last;
762 } 982 }
763 } 983 }
764 if ($::CONN->{open_container}) { 984 if ($::CONN->{open_container}) {
765 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 985 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
766 text => "Close container", 986 text => "Close container",
767 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 987 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
768 ); 988 );
769 } 989 }
770 }); 990 });
… …
776 my ($conn, $tag, $name) = @_; 996 my ($conn, $tag, $name) = @_;
777 $conn->{open_container} = $tag; 997 $conn->{open_container} = $tag;
778 update_floorbox; 998 update_floorbox;
779 999
780 $::INV_RIGHT_HB->clear (); 1000 $::INV_RIGHT_HB->clear ();
781 $::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);
782 1002
783 if ($tag != 0) { # Floor isn't closable, is it? 1003 if ($tag != 0) { # Floor isn't closable, is it?
784 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1004 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
785 text => "Close container", 1005 text => "Close container",
786 tooltip => "Close the currently open container (if one is open)", 1006 tooltip => "Close the currently open container (if one is open)",
787 on_activate => sub { 1007 on_activate => sub {
788 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1008 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
789 if $tag != 0; 1009 if $tag != 0;
… …
797} 1017}
798 1018
799sub update_containers { 1019sub update_containers {
800 my ($self) = @_; 1020 my ($self) = @_;
801 1021
802 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1022 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
803 my $todo = delete $self->{update_container} 1023 my $todo = delete $self->{update_container}
804 or return; 1024 or return;
805 1025
806 for my $tag (keys %$todo) { 1026 for my $tag (keys %$todo) {
807 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1027 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
844sub item_update { 1064sub item_update {
845 my ($self, $item) = @_; 1065 my ($self, $item) = @_;
846 1066
847 #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";
848 1068
849 CFClient::Item::update_widgets $item; 1069 CFPlus::Item::update_widgets $item;
850 1070
851 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1071 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
852 set_opencont ($::CONN, 0, "Floor"); 1072 set_opencont ($::CONN, 0, "Floor");
853 1073
854 } elsif ($item->{flags} & F_OPEN) { 1074 } elsif ($item->{flags} & F_OPEN) {
855 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1075 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
856 1076
857 } else { 1077 } else {
858 $self->{update_container}{$item->{container}}++; 1078 $self->{update_container}{$item->{container}}++;
859 $self->update_containers; 1079 $self->update_containers;
860 } 1080 }
… …
885 $::SERVER_INFO->set_markup ( 1105 $::SERVER_INFO->set_markup (
886 "server <tt>$self->{host}:$self->{port}</tt>\n" 1106 "server <tt>$self->{host}:$self->{port}</tt>\n"
887 . "protocol version <tt>$self->{version}</tt>\n" 1107 . "protocol version <tt>$self->{version}</tt>\n"
888 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1108 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
889 . "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"
890 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1114 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
891 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1115 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
892 . "map size $self->{mapw}×$self->{maph}\n" 1116 . "map size $self->{mapw}×$self->{maph}\n"
893 ); 1117 );
1118
1119 ::setup_build_button ($self->{editor_support}->{builder_ui});
894} 1120}
895 1121
896sub logged_in { 1122sub logged_in {
897 my ($self) = @_; 1123 my ($self) = @_;
898 1124
899 $self->send_ext_req (cfplus_support => "1", sub { 1125 $self->send_ext_req (cfplus_support => version => 1, sub {
900 $self->{cfplus_ext} = $_[0]; 1126 $self->{cfplus_ext} = $_[0]{version};
901 $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
902 }); 1139 });
903 1140
904 $self->update_server_info; 1141 $self->update_server_info;
905 1142
906 $self->send_command ("output-sync $::CFG->{output_sync}"); 1143 $self->send_command ("output-sync $::CFG->{output_sync}");
907 $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;
908 $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 }
909} 1155}
910 1156
911sub lookat { 1157sub lookat {
912 my ($self, $x, $y) = @_; 1158 my ($self, $x, $y) = @_;
913 1159
914 if ($self->{cfplus_ext}) { 1160 if ($self->{cfplus_ext}) {
915 $self->send_ext_req (lookat => "$x $y", sub { 1161 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
916 my %res = split /\x00/, $_[0]; 1162 my ($msg) = @_;
917 1163
918 if (exists $res{npc_dialog}) { 1164 if (exists $msg->{npc_dialog}) {
919 # start npc chat dialog 1165 # start npc chat dialog
920 $self->{npc_dialog} = new CFClient::NPCDialog:: 1166 $self->{npc_dialog} = new CFPlus::NPCDialog::
921 dx => $x, 1167 dx => $x,
922 dy => $y, 1168 dy => $y,
923 title => "$res{npc_dialog} (NPC)", 1169 title => "$msg->{npc_dialog} (NPC)",
924 conn => $self, 1170 conn => $self,
925 ; 1171 ;
926 } 1172 }
927 }); 1173 });
928 } 1174 }
… …
931} 1177}
932 1178
933sub destroy { 1179sub destroy {
934 my ($self) = @_; 1180 my ($self) = @_;
935 1181
936 $self->{npc_dialog}->destroy 1182 (delete $self->{npc_dialog})->destroy
937 if $self->{npc_dialog}; 1183 if $self->{npc_dialog};
938 1184
939 $self->SUPER::destroy; 1185 $self->SUPER::destroy;
940}
941 1186
1187 %$self = ();
1188}
1189
942package CFClient::NPCDialog; 1190package CFPlus::NPCDialog;
943 1191
944our @ISA = 'CFClient::UI::FancyFrame'; 1192our @ISA = 'CFPlus::UI::Toplevel';
945 1193
946sub new { 1194sub new {
947 my $class = shift; 1195 my $class = shift;
948 1196
949 my $self = $class->SUPER::new ( 1197 my $self = $class->SUPER::new (
… …
956 kw => { hi => 0, yes => 0, no => 0 }, 1204 kw => { hi => 0, yes => 0, no => 0 },
957 has_close_button => 1, 1205 has_close_button => 1,
958 @_, 1206 @_,
959 ); 1207 );
960 1208
961 Scalar::Util::weaken (my $this = $self); 1209 CFPlus::weaken (my $this = $self);
962 1210
963 $self->connect (delete => sub { $this->destroy; 1 }); 1211 $self->connect (delete => sub { $this->destroy; 1 });
964 1212
965 # better use a pane... 1213 # better use a pane...
966 $self->add (my $hbox = new CFClient::UI::HBox); 1214 $self->add (my $hbox = new CFPlus::UI::HBox);
967 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1215 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
968 1216
969 $hbox->add (my $vbox = new CFClient::UI::VBox); 1217 $hbox->add (my $vbox = new CFPlus::UI::VBox);
970 1218
971 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1219 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1220 $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" 1221 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 { 1222 on_activate => sub {
979 my ($entry, $text) = @_; 1223 my ($entry, $text) = @_;
980 1224
981 return unless $text =~ /\S/; 1225 return unless $text =~ /\S/;
982 1226
… …
985 1229
986 0 1230 0
987 }, 1231 },
988 ); 1232 );
989 1233
990 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1234 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
991 1235
992 $self->{bye_button} = new CFClient::UI::Button 1236 $self->{bye_button} = new CFPlus::UI::Button
993 text => "Bye (close)", 1237 text => "Bye (close)",
994 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.",
995 on_activate => sub { $this->destroy; 1 }, 1239 on_activate => sub { $this->destroy; 1 },
996 ; 1240 ;
997 1241
998 $self->update_options; 1242 $self->update_options;
999 1243
1000 $self->{token} = $self->{conn}->ext_token; 1244 $self->{id} = $self->{conn}->send_ext_req (
1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1245 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
1002 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1246 sub { $this && $this->feed (@_) }
1247 );
1003 1248
1004 $self->{entry}->grab_focus; 1249 $self->{entry}->grab_focus;
1005 1250
1006 $self->{textview}->add_paragraph ({ 1251 $self->{textview}->add_paragraph ({
1007 fg => [1, 1, 0, 1], 1252 fg => [1, 1, 0, 1],
… …
1013}; 1258};
1014 1259
1015sub update_options { 1260sub update_options {
1016 my ($self) = @_; 1261 my ($self) = @_;
1017 1262
1018 Scalar::Util::weaken $self; 1263 CFPlus::weaken $self;
1019 1264
1020 $self->{options}->clear; 1265 $self->{options}->clear;
1021 $self->{options}->add ($self->{bye_button}); 1266 $self->{options}->add ($self->{bye_button});
1022 1267
1023 for my $kw (sort keys %{ $self->{kw} }) { 1268 for my $kw (sort keys %{ $self->{kw} }) {
1024 $self->{options}->add (new CFClient::UI::Button 1269 $self->{options}->add (new CFPlus::UI::Button
1025 text => $kw, 1270 text => $kw,
1026 on_activate => sub { 1271 on_activate => sub {
1027 $self->send ($kw); 1272 $self->send ($kw);
1028 0 1273 0
1029 }, 1274 },
1030 ); 1275 );
1031 } 1276 }
1032} 1277}
1033 1278
1034sub feed { 1279sub feed {
1035 my ($self, $data) = @_; 1280 my ($self, $msg) = @_;
1036 1281
1037 Scalar::Util::weaken $self; 1282 CFPlus::weaken $self;
1038 1283
1039 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} || []};
1040 1287
1041 if ($type eq "msg") { 1288 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1042 my ($msg, @kw) = split /\x00/, $msg;
1043
1044 utf8::decode $_ for ($msg, @kw);
1045
1046 $self->{kw}{$_} = 1 for @kw;
1047
1048 $msg = "\n" . CFClient::UI::asxml $msg;
1049 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} };
1050 my @link; 1290 my @link;
1051 $msg =~ s{ 1291 $text =~ s{
1052 ($match) 1292 ($match)
1053 }{ 1293 }{
1054 my $kw = $1; 1294 my $kw = $1;
1055 1295
1056 push @link, new CFClient::UI::Label 1296 push @link, new CFPlus::UI::Label
1057 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1297 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1058 can_hover => 1, 1298 can_hover => 1,
1059 can_events => 1, 1299 can_events => 1,
1060 padding_x => 0, 1300 padding_x => 0,
1061 padding_y => 0, 1301 padding_y => 0,
1062 on_button_up => sub { 1302 on_button_up => sub {
1063 $self->send ($kw); 1303 $self->send ($kw);
1064 }; 1304 };
1065 1305
1066 chr 0xfffc 1306 "\x{fffc}"
1067 }giex; 1307 }giex;
1068 1308
1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1309 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1070 $self->{textview}->scroll_to_bottom; 1310 $self->{textview}->scroll_to_bottom;
1071 $self->update_options; 1311 $self->update_options;
1072 } else { 1312 } else {
1073 $self->destroy; 1313 $self->destroy;
1074 } 1314 }
… …
1077} 1317}
1078 1318
1079sub send { 1319sub send {
1080 my ($self, $msg) = @_; 1320 my ($self, $msg) = @_;
1081 1321
1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg }); 1322 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083 $self->{textview}->scroll_to_bottom; 1323 $self->{textview}->scroll_to_bottom;
1084 1324
1085 utf8::encode $msg; 1325 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1086 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1087} 1326}
1088 1327
1089sub destroy { 1328sub destroy {
1090 my ($self) = @_; 1329 my ($self) = @_;
1091 1330
1092 #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
1093 1332
1333 if ($self->{conn}) {
1094 $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};
1095 delete $self->{conn}{npc_dialog}; 1335 delete $self->{conn}{npc_dialog};
1096 $self->{conn}->disconnect_ext ($self->{token}); 1336 $self->{conn}->disconnect_ext ($self->{id});
1337 }
1097 1338
1098 $self->SUPER::destroy; 1339 $self->SUPER::destroy;
1099} 1340}
1100 1341
11011 13421
1343

Diff Legend

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