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

Diff Legend

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