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.73 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.121 by root, Sat Jul 14 13:08:40 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 = map { 33 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 45 for @args;
34 46
35 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
37 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} }
38 } CFPlus::Pod::find command_help => "*"; 51 CFPlus::Pod::find command => "*";
39 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 };
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 => {},
135 };
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 });
227
40 $self->{map_widget}->add_command (@$_) 228 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 229 for @cmd_help;
42 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 {
43 $self->{noface} = new_from_file CFPlus::Texture 238 $self->{noface} = my $tex = new_from_file CFPlus::Texture
44 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 }
45 242
46 $self->{open_container} = 0; 243 $self->{open_container} = 0;
47 244
48 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache";
50 $self->{facemap} = CFPlus::db_table "facemap";
51
52 # per server 245 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 246 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
54 247
55 $self 248 $self
56} 249}
57 250
58sub logprint { 251sub logprint {
… …
215 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 408 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
216 $::GAUGES->{food} ->set_value ($fo, $fo_m); 409 $::GAUGES->{food} ->set_value ($fo, $fo_m);
217 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 410 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
218 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 411 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
219 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 412 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
220 my $rng = $stats->{+CS_STAT_RANGE}; 413 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
221 $rng =~ s/^Range: //; # thank you so much dear server
222 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
223 my $title = $stats->{+CS_STAT_TITLE}; 414 my $title = $stats->{+CS_STAT_TITLE};
224 $title =~ s/^Player: //; 415 $title =~ s/^Player: //;
225 $::STATWIDS->{title} ->set_text ("Title: " . $title); 416 $::STATWIDS->{title} ->set_text ("Title: " . $title);
226 417
227 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 418 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
258 449
259 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>";
260 451
261 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);
262 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);
263 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264 454
265 my ($x, $y) = (0, 1); 455 my ($x, $y) = (0, 1);
266 for ( 456 for (
267 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] }
268 map [$_, $self->{skill_info}{$_}], 458 map [$_, $self->{skill_info}{$_}],
… …
277 if ($ev->{button} == 1) { 467 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 468 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 469 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 470 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 471 } elsif ($ev->{button} == 3) {
472 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 473 (new CFPlus::UI::Menu
283 items => [ 474 items => [
284 ["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"] }],
285 ["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"] }],
286 ], 477 ],
287 )->popup ($ev); 478 )->popup ($ev);
288 } else { 479 } else {
289 return 0; 480 return 0;
290 } 481 }
… …
294 485
295 $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
296 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);
297 $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
298 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);
299 $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);
300 492
301 $x++ and ($x, $y) = (0, $y + 1); 493 $x++ and ($x, $y) = (0, $y + 1);
302 } 494 }
303 } 495 }
304 496
… …
306 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 498 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
307 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 499 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
308 } 500 }
309} 501}
310 502
503sub macro_send {
504 my ($self, $macro) = @_;
505
506 for my $cmd (@{ $macro->{action} }) {
507 $self->send_command ($cmd);
508 }
509}
510
311sub user_send { 511sub user_send {
312 my ($self, $command) = @_; 512 my ($self, $command) = @_;
313 513
514 $self->{record}->($command)
314 if ($self->{record}) { 515 if $self->{record};
315 push @{$self->{record}}, $command;
316 }
317 516
318 $self->logprint ("send: ", $command); 517 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 518 $self->send_command ($command);
320 ::status ($command); 519 ::status ($command);
321} 520}
322 521
323sub start_record { 522sub record {
324 my ($self) = @_; 523 my ($self, $cb) = @_;
325 524
326 $self->{record} = []; 525 $self->{record} = $cb;
327}
328
329sub stop_record {
330 my ($self) = @_;
331 return delete $self->{record};
332} 526}
333 527
334sub map_scroll { 528sub map_scroll {
335 my ($self, $dx, $dy) = @_; 529 my ($self, $dx, $dy) = @_;
336 530
… …
338} 532}
339 533
340sub feed_map1a { 534sub feed_map1a {
341 my ($self, $data) = @_; 535 my ($self, $data) = @_;
342 536
343 $self->{map}->map1a_update ($data); 537 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
344 $self->{map_widget}->update; 538 $self->{map_widget}->update;
345} 539}
346 540
347sub magicmap { 541sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 542 my ($self, $w, $h, $x, $y, $data) = @_;
… …
357 or return; 551 or return;
358 552
359 my ($hash, $x, $y, $w, $h) = @$map_info; 553 my ($hash, $x, $y, $w, $h) = @$map_info;
360 554
361 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 555 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
362 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 556 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
363 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 557 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
364} 558}
365 559
366sub map_clear { 560sub map_clear {
367 my ($self) = @_; 561 my ($self) = @_;
… …
371 565
372 $self->{map}->clear; 566 $self->{map}->clear;
373 delete $self->{map_widget}{magicmap}; 567 delete $self->{map_widget}{magicmap};
374} 568}
375 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}
376 591
377sub load_map($$$) { 592sub load_map($$$) {
378 my ($self, $hash, $x, $y) = @_; 593 my ($self, $hash, $x, $y) = @_;
379 594
380 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) {
381 $data = Compress::LZF::decompress $data; 603 $data = Compress::LZF::decompress $data;
382 #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#
383 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
384 my $data = $self->{tilecache}->get ($id)
385 or next;
386 605
387 $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;
388 } 609 }
389 } 610 };
390} 611}
391 612
392# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 613# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
393# (server resource,s latency, bandwidth), so this hack is warranted. 614# (server resource,s latency, bandwidth), so this hack is warranted.
394# 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
… …
458 679
459 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 680 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
460 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 681 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
461 682
462 } else { 683 } else {
684 my $gen = $self->{map_change_gen};
463 $self->send_mapinfo ("spatial $path$tile", sub { 685 $self->send_mapinfo ("spatial $path$tile", sub {
686 return unless $gen == $self->{map_change_gen};
687
464 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 688 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 689
466 return if $mode ne "spatial"; 690 return if $mode ne "spatial";
467 691
468 $x += $self->{map}->ox; 692 $x += $self->{map}->ox;
… …
482 706
483sub map_change { 707sub map_change {
484 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 708 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
485 709
486 $self->flush_map; 710 $self->flush_map;
711
712 ++$self->{map_change_gen};
487 713
488 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 714 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
489 715
490 my $mapmapw = $self->{mapmap}->{w}; 716 my $mapmapw = $self->{mapmap}->{w};
491 my $mapmaph = $self->{mapmap}->{h}; 717 my $mapmaph = $self->{mapmap}->{h};
… …
508 $self->load_map ($hash, $x, $y); 734 $self->load_map ($hash, $x, $y);
509 $self->flood_fill (0, 0, 0, "", $hash, $flags); 735 $self->flood_fill (0, 0, 0, "", $hash, $flags);
510} 736}
511 737
512sub face_find { 738sub face_find {
513 my ($self, $facenum, $face) = @_; 739 my ($self, $facenum, $face, $cb) = @_;
514 740
515 my $hash = "$face->{chksum},$face->{name}"; 741 my $hash = "$face->{chksum},$face->{name}";
516 742
517 my $id = $self->{facemap}->get ($hash); 743 my $id = CFPlus::DB::get_tile_id_sync $hash;
518 744
519 unless ($id) {
520 # create new id for face
521 # I love transactions
522 for (1..100) {
523 my $txn = $CFPlus::DB_ENV->txn_begin;
524 my $status = $self->{facemap}->db_get (id => $id);
525 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
526 $id = ($id || 64) + 1;
527 if ($self->{facemap}->put (id => $id) == 0
528 && $self->{facemap}->put ($hash => $id) == 0) {
529 $txn->txn_commit;
530
531 goto gotid;
532 }
533 }
534 $txn->txn_abort;
535 }
536
537 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
538 }
539
540gotid:
541 $face->{id} = $id; 745 $face->{id} = $id;
542 $self->{map}->set_face ($facenum => $id);
543 $self->{faceid}[$facenum] = $id;#d# 746 $self->{faceid}[$facenum] = $id;
544 747
545 my $face = $self->{tilecache}->get ($id); 748 $self->{map}->set_tileid ($facenum => $id);
546 749
547 if ($face) { 750 CFPlus::DB::get tilecache => $id, $cb;
548 #$self->face_prefetch;
549 $face
550 } else {
551 my $tex = $self->{noface};
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 undef
554 };
555} 751}
556 752
557sub face_update { 753sub face_update {
558 my ($self, $facenum, $face, $changed) = @_; 754 my ($self, $facenum, $face, $changed) = @_;
559 755
560 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 756 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
757 if $changed;
561 758
562 $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});
563} 766}
564 767
565sub set_texture { 768sub set_texture {
566 my ($self, $id, $data) = @_; 769 my ($self, $id, $data) = @_;
567 770
771 return unless $self->{map};
772
568 $self->{texture}[$id] ||= do { 773 $self->{texture}[$id] = my $tex =
569 my $tex =
570 new_from_image CFPlus::Texture 774 new_from_image CFPlus::Texture
571 $data, minify => 1, mipmap => 1; 775 $data, minify => 1, mipmap => 1;
572 776
573 $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}});
574 $self->{map_widget}->update; 778 $self->{map_widget}->update;
575
576 $tex
577 };
578} 779}
579 780
580sub sound_play { 781sub sound_play {
581 my ($self, $x, $y, $soundnum, $type) = @_; 782 my ($self, $x, $y, $soundnum, $type) = @_;
582 783
… …
592 $LAST_QUERY = $prompt; 793 $LAST_QUERY = $prompt;
593 794
594 $self->{query}-> ($self, $flags, $prompt); 795 $self->{query}-> ($self, $flags, $prompt);
595} 796}
596 797
597sub drawinfo { 798sub sanitise_xml($) {
598 my ($self, $color, $text) = @_; 799 local $_ = shift;
599 800
600 my @color = ( 801 # we now weed out all tags we do not support
802 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
803 # now all entities
804 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
805
806 # handle some elements
807 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
808 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
809
810 $_
811}
812
813our %NAME_TO_COLOR = (
814 black => 0,
815 white => 1,
816 darkblue => 2,
817 red => 3,
818 orange => 4,
819 lightblue => 5,
820 darkorange => 6,
821 green => 7,
822 darkgreen => 8,
823 grey => 9,
824 brown => 10,
825 yellow => 11,
826 tan => 12,
827);
828
829our @CF_COLOR = (
601 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 830 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
602 [1.00, 1.00, 1.00], 831 [1.00, 1.00, 1.00],
603 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 832 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
604 [1.00, 0.00, 0.00], 833 [1.00, 0.00, 0.00],
605 [1.00, 0.54, 0.00], 834 [1.00, 0.54, 0.00],
606 [0.11, 0.56, 1.00], 835 [0.11, 0.56, 1.00],
607 [0.93, 0.46, 0.00], 836 [0.93, 0.46, 0.00],
608 [0.18, 0.54, 0.34], 837 [0.18, 0.54, 0.34],
609 [0.56, 0.73, 0.56], 838 [0.56, 0.73, 0.56],
610 [0.80, 0.80, 0.80], 839 [0.80, 0.80, 0.80],
611 [0.75, 0.61, 0.20], 840 [0.75, 0.61, 0.20],
612 [0.99, 0.77, 0.26], 841 [0.99, 0.77, 0.26],
613 [0.74, 0.65, 0.41], 842 [0.74, 0.65, 0.41],
614 ); 843);
615 844
845sub msg {
846 my ($self, $color, $type, $text, @extra) = @_;
847
848 $text = sanitise_xml $text;
849
850 if (my $cb = $self->{cb_msg}{$type}) {
851 $_->($self, $color, $type, $text, @extra) for values %$cb;
852 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
853 $type =~ s/-/_/g;
854 $self->{$type} = $text;
855 } else {
616 $self->logprint ("info: ", $text); 856 $self->logprint ("msg: ", $text);
857 return if $color < 0; # negative color == ignore if not understood
617 858
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 859 my $fg = $CF_COLOR[$color % @CF_COLOR];
619 860
620 # try to create single paragraphs of multiple lines sent by the server 861 ## try to create single paragraphs of multiple lines sent by the server
862 # no longer neecssary with TRT servers
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 863 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
622 864
623 $text = CFPlus::asxml $text; 865 ::message ({ fg => $fg, markup => $_ })
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 866 for split /\n/, $text;
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
626 867
627 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
628 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
629 $self->{logview}->scroll_to_bottom;
630
631 $self->{statusbox}->add ($text, 868 $self->{statusbox}->add ($text,
632 group => $text, 869 group => $text,
633 fg => $color[$color], 870 fg => $fg,
634 timeout => $color >= 2 ? 180 : 10, 871 timeout => $color >= 2 ? 180 : 10,
635 tooltip_font => $::FONT_FIXED, 872 tooltip_font => $::FONT_FIXED,
636 ); 873 );
637} 874 }
638
639sub drawextinfo {
640 my ($self, $color, $type, $subtype, $message) = @_;
641
642 $self->drawinfo ($color, $message);
643} 875}
644 876
645sub spell_add { 877sub spell_add {
646 my ($self, $spell) = @_; 878 my ($self, $spell) = @_;
647 879
648 # try to create single paragraphs out of the multiple lines sent by the server 880 # try to create single paragraphs out of the multiple lines sent by the server
649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 881 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
650 $spell->{message} =~ s/\n+$//; 882 $spell->{message} =~ s/\n+$//;
651 $spell->{message} ||= "Server did not provide a description for this spell."; 883 $spell->{message} ||= "Server did not provide a description for this spell.";
652 884
653 $::SPELL_PAGE->add_spell ($spell); 885 $::SPELL_LIST->add_spell ($spell);
654 886
655 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 887 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
656 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 888 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
657} 889}
658 890
659sub spell_delete { 891sub spell_delete {
660 my ($self, $spell) = @_; 892 my ($self, $spell) = @_;
661 893
662 $::SPELL_PAGE->remove_spell ($spell); 894 $::SPELL_LIST->remove_spell ($spell);
895}
896
897sub setup {
898 my ($self, $setup) = @_;
899
900 $self->{map_widget}->set_tilesize ($self->{tilesize});
901 $::MAP->resize ($self->{mapw}, $self->{maph});
663} 902}
664 903
665sub addme_success { 904sub addme_success {
666 my ($self) = @_; 905 my ($self) = @_;
667 906
… …
873 $::SERVER_INFO->set_markup ( 1112 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 1113 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 1114 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1115 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1116 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1117 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1118 . "editing support $yesno[!!$self->{editor_support}]\n"
1119 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1120 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1121 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1122 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 1123 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 1124 );
1125
1126 ::setup_build_button ($self->{editor_support}->{builder_ui});
882} 1127}
883 1128
884sub logged_in { 1129sub logged_in {
885 my ($self) = @_; 1130 my ($self) = @_;
886 1131
887 $self->send_ext_req (cfplus_support => version => 1, sub { 1132 $self->send_ext_req (cfplus_support => version => 1, sub {
888 $self->{cfplus_ext} = $_[0]{version}; 1133 $self->{cfplus_ext} = $_[0]{version};
889 $self->update_server_info; 1134 $self->update_server_info;
890 1135
1136 if ($self->{cfplus_ext} >= 2) {
1137 $self->send_ext_req ("editor_support", sub {
1138 $self->{editor_support} = $_[0];
1139 $self->update_server_info;
1140
1141 0
1142 });
1143 }
1144
891 0 1145 0
892 }); 1146 });
893 1147
894 $self->update_server_info; 1148 $self->update_server_info;
895 1149
896 $self->send_command ("output-sync $::CFG->{output_sync}"); 1150 $self->send_command ("output-sync $::CFG->{output_sync}");
897 $self->send_command ("output-count $::CFG->{output_count}"); 1151 $self->send_command ("output-count $::CFG->{output_count}");
1152 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
898 $self->send_command ("pickup $::CFG->{pickup}"); 1153 $self->send_command ("pickup $::CFG->{pickup}");
1154}
1155
1156sub buildat {
1157 my ($self, $builditem, $x, $y) = @_;
1158
1159 if ($self->{cfplus_ext}) {
1160 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1161 }
899} 1162}
900 1163
901sub lookat { 1164sub lookat {
902 my ($self, $x, $y) = @_; 1165 my ($self, $x, $y) = @_;
903 1166
… …
921} 1184}
922 1185
923sub destroy { 1186sub destroy {
924 my ($self) = @_; 1187 my ($self) = @_;
925 1188
926 $self->{npc_dialog}->destroy 1189 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 1190 if $self->{npc_dialog};
928 1191
929 $self->SUPER::destroy; 1192 $self->SUPER::destroy;
1193
1194 %$self = ();
930} 1195}
931 1196
932package CFPlus::NPCDialog; 1197package CFPlus::NPCDialog;
933 1198
934our @ISA = 'CFPlus::UI::FancyFrame'; 1199our @ISA = 'CFPlus::UI::Toplevel';
935 1200
936sub new { 1201sub new {
937 my $class = shift; 1202 my $class = shift;
938 1203
939 my $self = $class->SUPER::new ( 1204 my $self = $class->SUPER::new (
… …
946 kw => { hi => 0, yes => 0, no => 0 }, 1211 kw => { hi => 0, yes => 0, no => 0 },
947 has_close_button => 1, 1212 has_close_button => 1,
948 @_, 1213 @_,
949 ); 1214 );
950 1215
951 Scalar::Util::weaken (my $this = $self); 1216 CFPlus::weaken (my $this = $self);
952 1217
953 $self->connect (delete => sub { $this->destroy; 1 }); 1218 $self->connect (delete => sub { $this->destroy; 1 });
954 1219
955 # better use a pane... 1220 # better use a pane...
956 $self->add (my $hbox = new CFPlus::UI::HBox); 1221 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1000}; 1265};
1001 1266
1002sub update_options { 1267sub update_options {
1003 my ($self) = @_; 1268 my ($self) = @_;
1004 1269
1005 Scalar::Util::weaken $self; 1270 CFPlus::weaken $self;
1006 1271
1007 $self->{options}->clear; 1272 $self->{options}->clear;
1008 $self->{options}->add ($self->{bye_button}); 1273 $self->{options}->add ($self->{bye_button});
1009 1274
1010 for my $kw (sort keys %{ $self->{kw} }) { 1275 for my $kw (sort keys %{ $self->{kw} }) {
… …
1019} 1284}
1020 1285
1021sub feed { 1286sub feed {
1022 my ($self, $msg) = @_; 1287 my ($self, $msg) = @_;
1023 1288
1024 Scalar::Util::weaken $self; 1289 CFPlus::weaken $self;
1025 1290
1026 if ($msg->{msgtype} eq "reply") { 1291 if ($msg->{msgtype} eq "reply") {
1027 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1292 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1028 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1293 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1029 1294
1030 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1295 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1031 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1296 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1032 my @link; 1297 my @link;
1033 $text =~ s{ 1298 $text =~ s{
1034 ($match) 1299 ($match)
1035 }{ 1300 }{
… …
1043 padding_y => 0, 1308 padding_y => 0,
1044 on_button_up => sub { 1309 on_button_up => sub {
1045 $self->send ($kw); 1310 $self->send ($kw);
1046 }; 1311 };
1047 1312
1048 chr 0xfffc 1313 "\x{fffc}"
1049 }giex; 1314 }giex;
1050 1315
1051 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1316 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1052 $self->{textview}->scroll_to_bottom; 1317 $self->{textview}->scroll_to_bottom;
1053 $self->update_options; 1318 $self->update_options;
… …
1080 1345
1081 $self->SUPER::destroy; 1346 $self->SUPER::destroy;
1082} 1347}
1083 1348
10841 13491
1350

Diff Legend

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