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

Diff Legend

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