ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.69 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.122 by root, Sun Jul 15 22:07:48 2007 UTC

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

Diff Legend

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