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.93 by root, Fri Dec 22 03:43:05 2006 UTC vs.
Revision 1.125 by root, Sat Jul 21 15:04:27 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;
11use CFPlus::Macro; 12use CFPlus::Macro;
12use CFPlus::Item; 13use CFPlus::Item;
13 14
14use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
15 16
16use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
17 18
18sub new { 19sub new {
19 my $class = shift; 20 my ($class, %arg) = @_;
20 21
21 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 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 );
22 30
23 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
24 32
25 my @cmd_help = map { 33 my @cmd_help = map {
26 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
37 for @args; 45 for @args;
38 46
39 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
40 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
41 @args 49 @args
42 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
43 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
44 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 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_;
133
134 $self->{widgetset}{$arg{id}} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_;
142
143 my $ws = delete $self->{widgetset}{$arg{id}}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset destroy
151 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_;
153
154 my $args = $arg->{args} || {};
155
156 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub {
158 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
160
161 1
162 };
163 }
164
165 if (my $widget = eval {
166 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new (
168 %$args,
169 s_ws => $arg->{ws},
170 s_id => $arg->{id},
171 )
172 }
173 ) {
174 $self->{widget}{$arg->{id}}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176 = $widget;
177
178 $widget->connect (on_destroy => sub {
179 my ($widget) = @_;
180
181 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 });
184 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
187 }
188 });
189
190 # widget call
191 $self->connect_ext (w_c => sub {
192 my ($arg) = @_;
193
194 my $w = $self->{widget}{$arg->{id}}
195 or return;
196 my $m = $arg->{name};
197
198 my $a = $arg->{args} || [];
199
200 if (exists $arg->{rid}) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
202 } else {
203 $w->$m (@$a);
204 }
205 });
206
207 # widget set
208 $self->connect_ext (w_s => sub {
209 my ($arg) = @_;
210
211 my $w = $self->{widget}{$arg->{id}}
212 or return;
213
214 $w->{$_->[0]} = $_->[1]
215 for @{ $arg->{attr} };
216 });
217
218 # widget get
219 $self->connect_ext (w_g => sub {
220 my ($arg) = @_;
221
222 my $w = $self->{widget}{$arg->{id}}
223 or return;
224
225 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]);
226 });
227
228 # destroy widgets on logout
229 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
230 for my $ws (values %{delete $self->{widgetset} || {}}) {
231 $_->destroy
232 for values %{delete $ws->{w} || {}};
233 }
234 });
235
45 $self->{map_widget}->add_command (@$_) 236 $self->{map_widget}->add_command (@$_)
46 for @cmd_help; 237 for @cmd_help;
47
48 $self->{noface} = new_from_file CFPlus::Texture
49 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
50 238
51 { 239 {
52 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 240 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
53 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 241 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
54 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 242 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
55 } 243 }
56 244
245 {
246 $self->{noface} = my $tex = new_from_file CFPlus::Texture
247 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
248 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
249 }
250
57 $self->{open_container} = 0; 251 $self->{open_container} = 0;
58 252
59 # "global"
60 $self->{tilecache} = CFPlus::db_table "tilecache"
61 or die "tilecache: unable to open database table";
62 $self->{facemap} = CFPlus::db_table "facemap"
63 or die "facemap: unable to open database table";
64
65 # per server 253 # per server
66 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 254 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
67 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
68 255
69 $self 256 $self
70} 257}
71 258
72sub logprint { 259sub logprint {
… …
229 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 416 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
230 $::GAUGES->{food} ->set_value ($fo, $fo_m); 417 $::GAUGES->{food} ->set_value ($fo, $fo_m);
231 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 418 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
232 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 419 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
233 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 420 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
234 my $rng = $stats->{+CS_STAT_RANGE}; 421 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
235 $rng =~ s/^Range: //; # thank you so much dear server
236 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
237 my $title = $stats->{+CS_STAT_TITLE}; 422 my $title = $stats->{+CS_STAT_TITLE};
238 $title =~ s/^Player: //; 423 $title =~ s/^Player: //;
239 $::STATWIDS->{title} ->set_text ("Title: " . $title); 424 $::STATWIDS->{title} ->set_text ("Title: " . $title);
240 425
241 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 426 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
261 my @skills = keys %{ $self->{skill_info} }; 446 my @skills = keys %{ $self->{skill_info} };
262 447
263 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 448 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
264 $sktbl->clear; 449 $sktbl->clear;
265 450
451 my @add;
452
453 push @add,
266 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 454 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
267 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 455 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
268 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 456 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
269 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 457 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
270 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 458 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
271 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 459 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
460 ;
272 461
273 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 462 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
274 463
275 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 464 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
276 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 465 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
304 } 493 }
305 494
306 1 495 1
307 }; 496 };
308 497
498 push @add,
309 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 499 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
310 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 500 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
311 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 501 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
312 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 502 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
313 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 503 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
314 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 504 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
505 ;
315 506
316 $x++ and ($x, $y) = (0, $y + 1); 507 $x++ and ($x, $y) = (0, $y + 1);
317 } 508 }
509
510 $sktbl->add_at (@add);
318 } 511 }
319 512
320 for (grep exists $stats->{$_}, @skills) { 513 for (grep exists $stats->{$_}, @skills) {
321 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 514 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
322 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 515 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
374 or return; 567 or return;
375 568
376 my ($hash, $x, $y, $w, $h) = @$map_info; 569 my ($hash, $x, $y, $w, $h) = @$map_info;
377 570
378 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 571 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
379 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 572 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
380 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 573 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
381} 574}
382 575
383sub map_clear { 576sub map_clear {
384 my ($self) = @_; 577 my ($self) = @_;
… …
388 581
389 $self->{map}->clear; 582 $self->{map}->clear;
390 delete $self->{map_widget}{magicmap}; 583 delete $self->{map_widget}{magicmap};
391} 584}
392 585
586sub bg_fetch {
587 my ($self) = @_;
588
589 my $id;
590
591 do {
592 $id = pop @{$self->{bg_fetch}}
593 or return;
594 } while $self->{texture}[$id];
595
596 CFPlus::DB::get tilecache => $id, sub {
597 my ($data) = @_;
598
599 return unless $self->{map}; # stop when destroyed
600
601 $self->set_texture ($id => $data)
602 if defined $data;
603
604 $self->bg_fetch;
605 };
606}
393 607
394sub load_map($$$) { 608sub load_map($$$) {
395 my ($self, $hash, $x, $y) = @_; 609 my ($self, $hash, $x, $y) = @_;
396 610
397 if (defined (my $data = $self->{mapcache}->get ($hash))) { 611 my $gen = $self->{map_change_gen};
612
613 CFPlus::DB::get $self->{mapcache} => $hash, sub {
614 return unless $gen == $self->{map_change_gen};
615
616 my ($data) = @_;
617
618 if (defined $data) {
398 $data = Compress::LZF::decompress $data; 619 $data = Compress::LZF::decompress $data;
399 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 620 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
400 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
401 my $data = $self->{tilecache}->get ($id)
402 or next;
403 621
404 $self->set_texture ($id => $data); 622 my $inprogress = @{ $self->{bg_fetch} || [] };
623 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
624 $self->bg_fetch unless $inprogress;
405 } 625 }
406 } 626 };
407} 627}
408 628
409# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 629# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
410# (server resource,s latency, bandwidth), so this hack is warranted. 630# (server resource,s latency, bandwidth), so this hack is warranted.
411# the right fix is to make real tiled maps with an overview file 631# the right fix is to make real tiled maps with an overview file
… …
475 695
476 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 696 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
477 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 697 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
478 698
479 } else { 699 } else {
700 my $gen = $self->{map_change_gen};
480 $self->send_mapinfo ("spatial $path$tile", sub { 701 $self->send_mapinfo ("spatial $path$tile", sub {
702 return unless $gen == $self->{map_change_gen};
703
481 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 704 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
482 705
483 return if $mode ne "spatial"; 706 return if $mode ne "spatial";
484 707
485 $x += $self->{map}->ox; 708 $x += $self->{map}->ox;
… …
499 722
500sub map_change { 723sub map_change {
501 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 724 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
502 725
503 $self->flush_map; 726 $self->flush_map;
727
728 ++$self->{map_change_gen};
504 729
505 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 730 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
506 731
507 my $mapmapw = $self->{mapmap}->{w}; 732 my $mapmapw = $self->{mapmap}->{w};
508 my $mapmaph = $self->{mapmap}->{h}; 733 my $mapmaph = $self->{mapmap}->{h};
… …
525 $self->load_map ($hash, $x, $y); 750 $self->load_map ($hash, $x, $y);
526 $self->flood_fill (0, 0, 0, "", $hash, $flags); 751 $self->flood_fill (0, 0, 0, "", $hash, $flags);
527} 752}
528 753
529sub face_find { 754sub face_find {
530 my ($self, $facenum, $face) = @_; 755 my ($self, $facenum, $face, $cb) = @_;
531 756
532 my $hash = "$face->{chksum},$face->{name}"; 757 my $hash = "$face->{chksum},$face->{name}";
533 758
534 my $id = $self->{facemap}->get ($hash); 759 my $id = CFPlus::DB::get_tile_id_sync $hash;
535 760
536 unless ($id) {
537 # create new id for face
538 # I love transactions
539 for (1..100) {
540 my $txn = $CFPlus::DB_ENV->txn_begin;
541 my $status = $self->{facemap}->db_get (id => $id);
542 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
543 $id = ($id || 64) + 1;
544 if ($self->{facemap}->put (id => $id) == 0
545 && $self->{facemap}->put ($hash => $id) == 0) {
546 $txn->txn_commit;
547
548 goto gotid;
549 }
550 }
551 $txn->txn_abort;
552 }
553
554 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
555 }
556
557gotid:
558 $face->{id} = $id; 761 $face->{id} = $id;
559 $self->{map}->set_face ($facenum => $id);
560 $self->{faceid}[$facenum] = $id;#d# 762 $self->{faceid}[$facenum] = $id;
561 763
562 my $face = $self->{tilecache}->get ($id); 764 $self->{map}->set_tileid ($facenum => $id);
563 765
564 if ($face) { 766 CFPlus::DB::get tilecache => $id, $cb;
565 #$self->face_prefetch;
566 $face
567 } else {
568 my $tex = $self->{noface};
569 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
570 undef
571 };
572} 767}
573 768
574sub face_update { 769sub face_update {
575 my ($self, $facenum, $face, $changed) = @_; 770 my ($self, $facenum, $face, $changed) = @_;
576 771
577 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 772 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
773 if $changed;
578 774
579 $self->set_texture ($face->{id} => delete $face->{image}); 775 $self->set_texture ($face->{id} => delete $face->{image});
776}
777
778sub smooth_update {
779 my ($self, $facenum, $face) = @_;
780
781 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
580} 782}
581 783
582sub set_texture { 784sub set_texture {
583 my ($self, $id, $data) = @_; 785 my ($self, $id, $data) = @_;
584 786
787 return unless $self->{map};
788
585 $self->{texture}[$id] ||= do { 789 $self->{texture}[$id] = my $tex =
586 my $tex =
587 new_from_image CFPlus::Texture 790 new_from_image CFPlus::Texture
588 $data, minify => 1, mipmap => 1; 791 $data, minify => 1, mipmap => 1;
589 792
590 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 793 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
591 $self->{map_widget}->update; 794 $self->{map_widget}->update;
592 795
593 $tex 796 $_->() for @{(delete $self->{face_cb}{$id}) || []};
797}
798
799sub connect_face_update {
800 my ($self, $id, $cb) = @_;
801
802 push @{$self->{face_cb}{$id}}, $cb;
803
804 CFPlus::guard {
805 @{$self->{face_cb}{$id}}
806 = grep $_ != $cb,
807 @{$self->{face_cb}{$id}};
594 }; 808 }
595} 809}
596 810
597sub sound_play { 811sub sound_play {
598 my ($self, $x, $y, $soundnum, $type) = @_; 812 my ($self, $x, $y, $soundnum, $type) = @_;
599 813
… …
609 $LAST_QUERY = $prompt; 823 $LAST_QUERY = $prompt;
610 824
611 $self->{query}-> ($self, $flags, $prompt); 825 $self->{query}-> ($self, $flags, $prompt);
612} 826}
613 827
614sub drawinfo { 828sub sanitise_xml($) {
615 my ($self, $color, $text) = @_; 829 local $_ = shift;
616 830
617 my @color = ( 831 # we now weed out all tags we do not support
832 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
833 # now all entities
834 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
835
836 # handle some elements
837 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
838 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
839
840 $_
841}
842
843our %NAME_TO_COLOR = (
844 black => 0,
845 white => 1,
846 darkblue => 2,
847 red => 3,
848 orange => 4,
849 lightblue => 5,
850 darkorange => 6,
851 green => 7,
852 darkgreen => 8,
853 grey => 9,
854 brown => 10,
855 yellow => 11,
856 tan => 12,
857);
858
859our @CF_COLOR = (
618 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 860 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
619 [1.00, 1.00, 1.00], 861 [1.00, 1.00, 1.00],
620 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 862 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
621 [1.00, 0.00, 0.00], 863 [1.00, 0.00, 0.00],
622 [1.00, 0.54, 0.00], 864 [1.00, 0.54, 0.00],
623 [0.11, 0.56, 1.00], 865 [0.11, 0.56, 1.00],
624 [0.93, 0.46, 0.00], 866 [0.93, 0.46, 0.00],
625 [0.18, 0.54, 0.34], 867 [0.18, 0.54, 0.34],
626 [0.56, 0.73, 0.56], 868 [0.56, 0.73, 0.56],
627 [0.80, 0.80, 0.80], 869 [0.80, 0.80, 0.80],
628 [0.75, 0.61, 0.20], 870 [0.75, 0.61, 0.20],
629 [0.99, 0.77, 0.26], 871 [0.99, 0.77, 0.26],
630 [0.74, 0.65, 0.41], 872 [0.74, 0.65, 0.41],
631 ); 873);
632 874
633 my $fg = $color[$color % @color]; 875sub msg {
876 my ($self, $color, $type, $text, @extra) = @_;
634 877
878 $text = sanitise_xml $text;
879
880 if (my $cb = $self->{cb_msg}{$type}) {
881 $_->($self, $color, $type, $text, @extra) for values %$cb;
882 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
883 $type =~ s/-/_/g;
884 $self->{$type} = $text;
885 } else {
635 $self->logprint ("info: ", $text); 886 $self->logprint ("msg: ", $text);
887 return if $color < 0; # negative color == ignore if not understood
636 888
889 my $fg = $CF_COLOR[$color % @CF_COLOR];
890
637 # try to create single paragraphs of multiple lines sent by the server 891 ## try to create single paragraphs of multiple lines sent by the server
892 # no longer neecssary with TRT servers
638 $text =~ s/(?<=\S)\n(?=\w)/ /g; 893 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
639 894
640 $text = CFPlus::asxml $text;
641 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
642 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
643
644 ::message ({ fg => $fg, markup => $_ }) 895 ::message ({ fg => $fg, markup => $_ })
645 for split /\n/, $text; 896 for split /\n/, $text;
646 897
647 $self->{statusbox}->add ($text, 898 $self->{statusbox}->add ($text,
648 group => $text, 899 group => $text,
649 fg => $fg, 900 fg => $fg,
650 timeout => $color >= 2 ? 180 : 10, 901 timeout => $color >= 2 ? 180 : 10,
651 tooltip_font => $::FONT_FIXED, 902 tooltip_font => $::FONT_FIXED,
652 ); 903 );
653} 904 }
654
655sub drawextinfo {
656 my ($self, $color, $type, $subtype, $message) = @_;
657
658 $self->drawinfo ($color, $message);
659} 905}
660 906
661sub spell_add { 907sub spell_add {
662 my ($self, $spell) = @_; 908 my ($self, $spell) = @_;
663 909
… …
679} 925}
680 926
681sub setup { 927sub setup {
682 my ($self, $setup) = @_; 928 my ($self, $setup) = @_;
683 929
930 $self->{map_widget}->set_tilesize ($self->{tilesize});
684 $::MAP->resize ($self->{mapw}, $self->{maph}); 931 $::MAP->resize ($self->{mapw}, $self->{maph});
685} 932}
686 933
687sub addme_success { 934sub addme_success {
688 my ($self) = @_; 935 my ($self) = @_;
… …
750 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 997 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
751 return unless $::CONN; 998 return unless $::CONN;
752 999
753 $::FLOORBOX->clear; 1000 $::FLOORBOX->clear;
754 1001
1002 my @add;
1003
755 my $row; 1004 my $row;
756 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1005 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
757 if ($row < 6) { 1006 if ($row < 6) {
758 local $_->{face_widget}; # hack to force recreation of widget 1007 local $_->{face_widget}; # hack to force recreation of widget
759 local $_->{desc_widget}; # hack to force recreation of widget 1008 local $_->{desc_widget}; # hack to force recreation of widget
760 CFPlus::Item::update_widgets $_; 1009 CFPlus::Item::update_widgets $_;
761 1010
1011 push @add,
762 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1012 0, $row, $_->{face_widget},
763 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1013 1, $row, $_->{desc_widget};
764 1014
765 $row++; 1015 $row++;
766 } else { 1016 } else {
767 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1017 push @add, 1, $row, new CFPlus::UI::Button
768 text => "More...", 1018 text => "More...",
769 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1019 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
770 ); 1020 ;
771 last; 1021 last;
772 } 1022 }
773 } 1023 }
774 if ($::CONN->{open_container}) { 1024 if ($::CONN->{open_container}) {
775 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1025 push @add, 1, $row++, new CFPlus::UI::Button
776 text => "Close container", 1026 text => "Close container",
777 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1027 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
778 ); 1028 ;
779 } 1029 }
1030
1031 $::FLOORBOX->add_at (@add);
780 }); 1032 });
781 1033
782 $::WANT_REFRESH++; 1034 $::WANT_REFRESH++;
783} 1035}
784 1036
… …
895 $::SERVER_INFO->set_markup ( 1147 $::SERVER_INFO->set_markup (
896 "server <tt>$self->{host}:$self->{port}</tt>\n" 1148 "server <tt>$self->{host}:$self->{port}</tt>\n"
897 . "protocol version <tt>$self->{version}</tt>\n" 1149 . "protocol version <tt>$self->{version}</tt>\n"
898 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1150 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
899 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1151 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1152 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
900 . "editing support $yesno[!!$self->{editor_support}]\n" 1153 . "editing support $yesno[!!$self->{editor_support}]\n"
901 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1154 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1155 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
902 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1156 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
903 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1157 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
904 . "map size $self->{mapw}×$self->{maph}\n" 1158 . "map size $self->{mapw}×$self->{maph}\n"
905 ); 1159 );
906 1160
… …
928 1182
929 $self->update_server_info; 1183 $self->update_server_info;
930 1184
931 $self->send_command ("output-sync $::CFG->{output_sync}"); 1185 $self->send_command ("output-sync $::CFG->{output_sync}");
932 $self->send_command ("output-count $::CFG->{output_count}"); 1186 $self->send_command ("output-count $::CFG->{output_count}");
1187 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
933 $self->send_command ("pickup $::CFG->{pickup}"); 1188 $self->send_command ("pickup $::CFG->{pickup}");
934} 1189}
935 1190
936sub buildat { 1191sub buildat {
937 my ($self, $builditem, $x, $y) = @_; 1192 my ($self, $builditem, $x, $y) = @_;
… …
968 1223
969 (delete $self->{npc_dialog})->destroy 1224 (delete $self->{npc_dialog})->destroy
970 if $self->{npc_dialog}; 1225 if $self->{npc_dialog};
971 1226
972 $self->SUPER::destroy; 1227 $self->SUPER::destroy;
1228
1229 %$self = ();
973} 1230}
974 1231
975package CFPlus::NPCDialog; 1232package CFPlus::NPCDialog;
976 1233
977our @ISA = 'CFPlus::UI::Toplevel'; 1234our @ISA = 'CFPlus::UI::Toplevel';
… …
1068 1325
1069 if ($msg->{msgtype} eq "reply") { 1326 if ($msg->{msgtype} eq "reply") {
1070 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1327 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1071 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1328 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1072 1329
1073 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1330 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1074 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1331 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1075 my @link; 1332 my @link;
1076 $text =~ s{ 1333 $text =~ s{
1077 ($match) 1334 ($match)
1078 }{ 1335 }{

Diff Legend

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