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.129 by root, Mon Jul 23 23:37:57 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 (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 (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 ($id) = @_;
133
134 $self->{widgetset}{$id} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($id) = @_;
142
143 my $ws = delete $self->{widgetset}{$id}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset create
151 $self->connect_ext (ws_c => sub {
152 my ($ws, $id, $class, $args) = @_;
153
154 for my $ev (grep /^on_/, keys %$args) {
155 $args->{$ev} = sub {
156 my $id = shift->{s_id};
157 $self->send_exti_msg (w_e => $id, $ev, \@_);
158
159 1
160 };
161 }
162
163 if (my $widget = eval {
164 local $SIG{__DIE__};
165 "CFPlus::UI::$class"->new (
166 %$args,
167 s_ws => $ws,
168 s_id => $id,
169 )
170 }
171 ) {
172 $self->{widget}{$id}
173 = $self->{widgetset}{$ws}{w}{$id}
174 = $widget;
175
176 $widget->connect (on_destroy => sub {
177 my ($widget) = @_;
178
179 delete $self->{widget}{$widget->{s_id}};
180 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
181 });
182 } else {
183 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
184 $self->send_exti_msg (w_e => $id, "destroy");
185 }
186 });
187
188 # widget call
189 $self->connect_ext (w_c => sub {
190 my ($id, $rid, $method, $args) = @_;
191
192 my $w = $self->{widget}{$id}
193 or return;
194
195 $args ||= [];
196
197 if ($rid) {
198 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
199 } else {
200 $w->$method (@$args);
201 }
202 });
203
204 # widget set
205 $self->connect_ext (w_s => sub {
206 my ($id, $attr) = @_;
207
208 my $w = $self->{widget}{$id}
209 or return;
210
211 for (my $i = 0; $i < $#$attr; $i += 2) {
212 my ($member, $value) = @$attr[$i, $i+1];
213 if (defined $value) {
214 $w->{$member} = $value;
215 } else {
216 delete $w->{$member};
217 }
218 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
219 }
220 });
221
222 # widget get
223 $self->connect_ext (w_g => sub {
224 my ($id, $rid, $attr) = @_;
225
226 my $w = $self->{widget}{$id}
227 or return;
228
229 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
230 });
231
232 # destroy widgets on logout
233 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
234 for my $ws (values %{delete $self->{widgetset} || {}}) {
235 $_->destroy
236 for values %{delete $ws->{w} || {}};
237 }
238 });
239
45 $self->{map_widget}->add_command (@$_) 240 $self->{map_widget}->add_command (@$_)
46 for @cmd_help; 241 for @cmd_help;
47
48 $self->{noface} = new_from_file CFPlus::Texture
49 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
50 242
51 { 243 {
52 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 244 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
53 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 245 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
54 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 246 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
55 } 247 }
56 248
249 {
250 $self->{noface} = my $tex = new_from_file CFPlus::Texture
251 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
252 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
253 }
254
57 $self->{open_container} = 0; 255 $self->{open_container} = 0;
58 256
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 257 # per server
66 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 258 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
67 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
68 259
69 $self 260 $self
70} 261}
71 262
72sub logprint { 263sub logprint {
… …
229 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 420 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
230 $::GAUGES->{food} ->set_value ($fo, $fo_m); 421 $::GAUGES->{food} ->set_value ($fo, $fo_m);
231 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 422 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
232 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 423 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
233 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 424 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
234 my $rng = $stats->{+CS_STAT_RANGE}; 425 $::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}; 426 my $title = $stats->{+CS_STAT_TITLE};
238 $title =~ s/^Player: //; 427 $title =~ s/^Player: //;
239 $::STATWIDS->{title} ->set_text ("Title: " . $title); 428 $::STATWIDS->{title} ->set_text ("Title: " . $title);
240 429
241 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 430 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
261 my @skills = keys %{ $self->{skill_info} }; 450 my @skills = keys %{ $self->{skill_info} };
262 451
263 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 452 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
264 $sktbl->clear; 453 $sktbl->clear;
265 454
455 my @add;
456
457 push @add,
266 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 458 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
267 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 459 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
268 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 460 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
269 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 461 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
270 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 462 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
271 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 463 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
464 ;
272 465
273 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 466 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
274 467
275 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 468 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); 469 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
304 } 497 }
305 498
306 1 499 1
307 }; 500 };
308 501
502 push @add,
309 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 503 $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); 504 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 505 $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); 506 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, 507 $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); 508 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
509 ;
315 510
316 $x++ and ($x, $y) = (0, $y + 1); 511 $x++ and ($x, $y) = (0, $y + 1);
317 } 512 }
513
514 $sktbl->add_at (@add);
318 } 515 }
319 516
320 for (grep exists $stats->{$_}, @skills) { 517 for (grep exists $stats->{$_}, @skills) {
321 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 518 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
322 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 519 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
374 or return; 571 or return;
375 572
376 my ($hash, $x, $y, $w, $h) = @$map_info; 573 my ($hash, $x, $y, $w, $h) = @$map_info;
377 574
378 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 575 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
379 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 576 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
380 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 577 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
381} 578}
382 579
383sub map_clear { 580sub map_clear {
384 my ($self) = @_; 581 my ($self) = @_;
… …
388 585
389 $self->{map}->clear; 586 $self->{map}->clear;
390 delete $self->{map_widget}{magicmap}; 587 delete $self->{map_widget}{magicmap};
391} 588}
392 589
590sub bg_fetch {
591 my ($self) = @_;
592
593 my $id;
594
595 do {
596 $id = pop @{$self->{bg_fetch}}
597 or return;
598 } while $self->{texture}[$id];
599
600 CFPlus::DB::get tilecache => $id, sub {
601 my ($data) = @_;
602
603 return unless $self->{map}; # stop when destroyed
604
605 $self->set_texture ($id => $data)
606 if defined $data;
607
608 $self->bg_fetch;
609 };
610}
393 611
394sub load_map($$$) { 612sub load_map($$$) {
395 my ($self, $hash, $x, $y) = @_; 613 my ($self, $hash, $x, $y) = @_;
396 614
397 if (defined (my $data = $self->{mapcache}->get ($hash))) { 615 my $gen = $self->{map_change_gen};
616
617 CFPlus::DB::get $self->{mapcache} => $hash, sub {
618 return unless $gen == $self->{map_change_gen};
619
620 my ($data) = @_;
621
622 if (defined $data) {
398 $data = Compress::LZF::decompress $data; 623 $data = Compress::LZF::decompress $data;
399 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 624 #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 625
404 $self->set_texture ($id => $data); 626 my $inprogress = @{ $self->{bg_fetch} || [] };
627 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
628 $self->bg_fetch unless $inprogress;
405 } 629 }
406 } 630 };
407} 631}
408 632
409# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 633# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
410# (server resource,s latency, bandwidth), so this hack is warranted. 634# (server resource,s latency, bandwidth), so this hack is warranted.
411# the right fix is to make real tiled maps with an overview file 635# the right fix is to make real tiled maps with an overview file
… …
475 699
476 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 700 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
477 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 701 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
478 702
479 } else { 703 } else {
704 my $gen = $self->{map_change_gen};
480 $self->send_mapinfo ("spatial $path$tile", sub { 705 $self->send_mapinfo ("spatial $path$tile", sub {
706 return unless $gen == $self->{map_change_gen};
707
481 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 708 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
482 709
483 return if $mode ne "spatial"; 710 return if $mode ne "spatial";
484 711
485 $x += $self->{map}->ox; 712 $x += $self->{map}->ox;
… …
499 726
500sub map_change { 727sub map_change {
501 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 728 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
502 729
503 $self->flush_map; 730 $self->flush_map;
731
732 ++$self->{map_change_gen};
504 733
505 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 734 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
506 735
507 my $mapmapw = $self->{mapmap}->{w}; 736 my $mapmapw = $self->{mapmap}->{w};
508 my $mapmaph = $self->{mapmap}->{h}; 737 my $mapmaph = $self->{mapmap}->{h};
… …
525 $self->load_map ($hash, $x, $y); 754 $self->load_map ($hash, $x, $y);
526 $self->flood_fill (0, 0, 0, "", $hash, $flags); 755 $self->flood_fill (0, 0, 0, "", $hash, $flags);
527} 756}
528 757
529sub face_find { 758sub face_find {
530 my ($self, $facenum, $face) = @_; 759 my ($self, $facenum, $face, $cb) = @_;
531 760
532 my $hash = "$face->{chksum},$face->{name}"; 761 my $hash = "$face->{chksum},$face->{name}";
533 762
534 my $id = $self->{facemap}->get ($hash); 763 my $id = CFPlus::DB::get_tile_id_sync $hash;
535 764
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; 765 $face->{id} = $id;
559 $self->{map}->set_face ($facenum => $id);
560 $self->{faceid}[$facenum] = $id;#d# 766 $self->{faceid}[$facenum] = $id;
561 767
562 my $face = $self->{tilecache}->get ($id); 768 $self->{map}->set_tileid ($facenum => $id);
563 769
564 if ($face) { 770 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} 771}
573 772
574sub face_update { 773sub face_update {
575 my ($self, $facenum, $face, $changed) = @_; 774 my ($self, $facenum, $face, $changed) = @_;
576 775
577 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 776 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
777 if $changed;
578 778
579 $self->set_texture ($face->{id} => delete $face->{image}); 779 $self->set_texture ($face->{id} => delete $face->{image});
780}
781
782sub smooth_update {
783 my ($self, $facenum, $face) = @_;
784
785 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
580} 786}
581 787
582sub set_texture { 788sub set_texture {
583 my ($self, $id, $data) = @_; 789 my ($self, $id, $data) = @_;
584 790
791 return unless $self->{map};
792
585 $self->{texture}[$id] ||= do { 793 $self->{texture}[$id] = my $tex =
586 my $tex =
587 new_from_image CFPlus::Texture 794 new_from_image CFPlus::Texture
588 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
589 796
590 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 797 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
591 $self->{map_widget}->update; 798 $self->{map_widget}->update;
592 799
593 $tex 800 $_->() for @{(delete $self->{face_cb}{$id}) || []};
801}
802
803sub connect_face_update {
804 my ($self, $id, $cb) = @_;
805
806 push @{$self->{face_cb}{$id}}, $cb;
807
808 CFPlus::guard {
809 @{$self->{face_cb}{$id}}
810 = grep $_ != $cb,
811 @{$self->{face_cb}{$id}};
594 }; 812 }
595} 813}
596 814
597sub sound_play { 815sub sound_play {
598 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
599 817
… …
609 $LAST_QUERY = $prompt; 827 $LAST_QUERY = $prompt;
610 828
611 $self->{query}-> ($self, $flags, $prompt); 829 $self->{query}-> ($self, $flags, $prompt);
612} 830}
613 831
614sub drawinfo { 832sub sanitise_xml($) {
615 my ($self, $color, $text) = @_; 833 local $_ = shift;
616 834
617 my @color = ( 835 # we now weed out all tags we do not support
836 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
837 # now all entities
838 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
839
840 # handle some elements
841 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
842 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
843
844 $_
845}
846
847our %NAME_TO_COLOR = (
848 black => 0,
849 white => 1,
850 darkblue => 2,
851 red => 3,
852 orange => 4,
853 lightblue => 5,
854 darkorange => 6,
855 green => 7,
856 darkgreen => 8,
857 grey => 9,
858 brown => 10,
859 yellow => 11,
860 tan => 12,
861);
862
863our @CF_COLOR = (
618 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 864 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
619 [1.00, 1.00, 1.00], 865 [1.00, 1.00, 1.00],
620 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 866 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
621 [1.00, 0.00, 0.00], 867 [1.00, 0.00, 0.00],
622 [1.00, 0.54, 0.00], 868 [1.00, 0.54, 0.00],
623 [0.11, 0.56, 1.00], 869 [0.11, 0.56, 1.00],
624 [0.93, 0.46, 0.00], 870 [0.93, 0.46, 0.00],
625 [0.18, 0.54, 0.34], 871 [0.18, 0.54, 0.34],
626 [0.56, 0.73, 0.56], 872 [0.56, 0.73, 0.56],
627 [0.80, 0.80, 0.80], 873 [0.80, 0.80, 0.80],
628 [0.75, 0.61, 0.20], 874 [0.75, 0.61, 0.20],
629 [0.99, 0.77, 0.26], 875 [0.99, 0.77, 0.26],
630 [0.74, 0.65, 0.41], 876 [0.74, 0.65, 0.41],
631 ); 877);
632 878
633 my $fg = $color[$color % @color]; 879sub msg {
880 my ($self, $color, $type, $text, @extra) = @_;
634 881
882 $text = sanitise_xml $text;
883
884 if (my $cb = $self->{cb_msg}{$type}) {
885 $_->($self, $color, $type, $text, @extra) for values %$cb;
886 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
887 $type =~ s/-/_/g;
888 $self->{$type} = $text;
889 } else {
635 $self->logprint ("info: ", $text); 890 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood
636 892
893 my $fg = $CF_COLOR[$color % @CF_COLOR];
894
637 # try to create single paragraphs of multiple lines sent by the server 895 ## try to create single paragraphs of multiple lines sent by the server
896 # no longer neecssary with TRT servers
638 $text =~ s/(?<=\S)\n(?=\w)/ /g; 897 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
639 898
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 => $_ }) 899 ::message ({ fg => $fg, markup => $_ })
645 for split /\n/, $text; 900 for split /\n/, $text;
646 901
647 $self->{statusbox}->add ($text, 902 $self->{statusbox}->add ($text,
648 group => $text, 903 group => $text,
649 fg => $fg, 904 fg => $fg,
650 timeout => $color >= 2 ? 180 : 10, 905 timeout => $color >= 2 ? 180 : 10,
651 tooltip_font => $::FONT_FIXED, 906 tooltip_font => $::FONT_FIXED,
652 ); 907 );
653} 908 }
654
655sub drawextinfo {
656 my ($self, $color, $type, $subtype, $message) = @_;
657
658 $self->drawinfo ($color, $message);
659} 909}
660 910
661sub spell_add { 911sub spell_add {
662 my ($self, $spell) = @_; 912 my ($self, $spell) = @_;
663 913
… …
679} 929}
680 930
681sub setup { 931sub setup {
682 my ($self, $setup) = @_; 932 my ($self, $setup) = @_;
683 933
934 $self->{map_widget}->set_tilesize ($self->{tilesize});
684 $::MAP->resize ($self->{mapw}, $self->{maph}); 935 $::MAP->resize ($self->{mapw}, $self->{maph});
685} 936}
686 937
687sub addme_success { 938sub addme_success {
688 my ($self) = @_; 939 my ($self) = @_;
… …
750 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
751 return unless $::CONN; 1002 return unless $::CONN;
752 1003
753 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
754 1005
1006 my @add;
1007
755 my $row; 1008 my $row;
756 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1009 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
757 if ($row < 6) { 1010 if ($row < 6) {
758 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
759 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
760 CFPlus::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
761 1014
1015 push @add,
762 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
763 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
764 1018
765 $row++; 1019 $row++;
766 } else { 1020 } else {
767 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1021 push @add, 1, $row, new CFPlus::UI::Button
768 text => "More...", 1022 text => "More...",
769 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
770 ); 1024 ;
771 last; 1025 last;
772 } 1026 }
773 } 1027 }
774 if ($::CONN->{open_container}) { 1028 if ($::CONN->{open_container}) {
775 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1029 push @add, 1, $row++, new CFPlus::UI::Button
776 text => "Close container", 1030 text => "Close container",
777 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
778 ); 1032 ;
779 } 1033 }
1034
1035 $::FLOORBOX->add_at (@add);
780 }); 1036 });
781 1037
782 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
783} 1039}
784 1040
… …
895 $::SERVER_INFO->set_markup ( 1151 $::SERVER_INFO->set_markup (
896 "server <tt>$self->{host}:$self->{port}</tt>\n" 1152 "server <tt>$self->{host}:$self->{port}</tt>\n"
897 . "protocol version <tt>$self->{version}</tt>\n" 1153 . "protocol version <tt>$self->{version}</tt>\n"
898 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1154 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
899 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1155 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1156 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
900 . "editing support $yesno[!!$self->{editor_support}]\n" 1157 . "editing support $yesno[!!$self->{editor_support}]\n"
901 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1158 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1159 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
902 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
903 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
904 . "map size $self->{mapw}×$self->{maph}\n" 1162 . "map size $self->{mapw}×$self->{maph}\n"
905 ); 1163 );
906 1164
… …
908} 1166}
909 1167
910sub logged_in { 1168sub logged_in {
911 my ($self) = @_; 1169 my ($self) = @_;
912 1170
913 $self->send_ext_req (cfplus_support => version => 1, sub { 1171 $self->send_ext_req (cfplus_support => version => 2, sub {
1172 my (%msg) = @_;
1173
914 $self->{cfplus_ext} = $_[0]{version}; 1174 $self->{cfplus_ext} = $msg{version};
915 $self->update_server_info; 1175 $self->update_server_info;
916 1176
917 if ($self->{cfplus_ext} >= 2) { 1177 if ($self->{cfplus_ext} >= 2) {
918 $self->send_ext_req ("editor_support", sub { 1178 $self->send_ext_req ("editor_support", sub {
919 $self->{editor_support} = $_[0]; 1179 $self->{editor_support} = { @_ };
920 $self->update_server_info; 1180 $self->update_server_info;
921 1181
922 0 1182 0
923 }); 1183 });
924 } 1184 }
… …
928 1188
929 $self->update_server_info; 1189 $self->update_server_info;
930 1190
931 $self->send_command ("output-sync $::CFG->{output_sync}"); 1191 $self->send_command ("output-sync $::CFG->{output_sync}");
932 $self->send_command ("output-count $::CFG->{output_count}"); 1192 $self->send_command ("output-count $::CFG->{output_count}");
1193 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
933 $self->send_command ("pickup $::CFG->{pickup}"); 1194 $self->send_command ("pickup $::CFG->{pickup}");
934} 1195}
935 1196
936sub buildat { 1197sub buildat {
937 my ($self, $builditem, $x, $y) = @_; 1198 my ($self, $builditem, $x, $y) = @_;
… …
943 1204
944sub lookat { 1205sub lookat {
945 my ($self, $x, $y) = @_; 1206 my ($self, $x, $y) = @_;
946 1207
947 if ($self->{cfplus_ext}) { 1208 if ($self->{cfplus_ext}) {
948 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1209 $self->send_ext_req (lookat => $x, $y, sub {
949 my ($msg) = @_; 1210 my (%msg) = @_;
950 1211
951 if (exists $msg->{npc_dialog}) { 1212 if (exists $msg{npc_dialog}) {
952 # start npc chat dialog 1213 # start npc chat dialog
953 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1214 $self->{npc_dialog} = new CFPlus::NPCDialog::
954 dx => $x, 1215 token => $msg{npc_dialog},
955 dy => $y,
956 title => "$msg->{npc_dialog} (NPC)", 1216 title => "$msg{npc_dialog}[0] (NPC)",
957 conn => $self, 1217 conn => $self,
958 ; 1218 ;
959 } 1219 }
960 }); 1220 });
961 } 1221 }
… …
968 1228
969 (delete $self->{npc_dialog})->destroy 1229 (delete $self->{npc_dialog})->destroy
970 if $self->{npc_dialog}; 1230 if $self->{npc_dialog};
971 1231
972 $self->SUPER::destroy; 1232 $self->SUPER::destroy;
1233
1234 %$self = ();
973} 1235}
974 1236
975package CFPlus::NPCDialog; 1237package CFPlus::NPCDialog;
976 1238
977our @ISA = 'CFPlus::UI::Toplevel'; 1239our @ISA = 'CFPlus::UI::Toplevel';
… …
1024 on_activate => sub { $this->destroy; 1 }, 1286 on_activate => sub { $this->destroy; 1 },
1025 ; 1287 ;
1026 1288
1027 $self->update_options; 1289 $self->update_options;
1028 1290
1029 $self->{id} = $self->{conn}->send_ext_req ( 1291 $self->{id} = "npc-channel-" . $self->{conn}->token;
1030 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1292 $self->{conn}->connect_ext ($self->{id} => sub {
1031 sub { $this && $this->feed (@_) } 1293 $this->feed (@_) if $this;
1032 ); 1294 });
1295
1296 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1033 1297
1034 $self->{entry}->grab_focus; 1298 $self->{entry}->grab_focus;
1035 1299
1036 $self->{textview}->add_paragraph ({ 1300 $self->{textview}->add_paragraph ({
1037 fg => [1, 1, 0, 1], 1301 fg => [1, 1, 0, 1],
… …
1060 ); 1324 );
1061 } 1325 }
1062} 1326}
1063 1327
1064sub feed { 1328sub feed {
1065 my ($self, $msg) = @_; 1329 my ($self, $type, @arg) = @_;
1066 1330
1067 CFPlus::weaken $self; 1331 CFPlus::weaken $self;
1068 1332
1069 if ($msg->{msgtype} eq "reply") { 1333 if ($type eq "update") {
1334 my (%info) = @arg;
1335
1070 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1336 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1071 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1337 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1072
1073 my $text = "\n" . CFPlus::asxml $msg->{msg};
1074 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1075 my @link;
1076 $text =~ s{
1077 ($match)
1078 }{
1079 my $kw = $1;
1080
1081 push @link, new CFPlus::UI::Label
1082 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1083 can_hover => 1,
1084 can_events => 1,
1085 padding_x => 0,
1086 padding_y => 0,
1087 on_button_up => sub {
1088 $self->send ($kw);
1089 };
1090
1091 "\x{fffc}"
1092 }giex;
1093 1338
1339 if (exists $info{msg}) {
1340 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1341 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1342 my @link;
1343 $text =~ s{
1344 ($match)
1345 }{
1346 my $kw = $1;
1347
1348 push @link, new CFPlus::UI::Label
1349 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1350 can_hover => 1,
1351 can_events => 1,
1352 padding_x => 0,
1353 padding_y => 0,
1354 on_button_up => sub {
1355 $self->send ($kw);
1356 };
1357
1358 "\x{fffc}"
1359 }giex;
1360
1094 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1361 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1095 $self->{textview}->scroll_to_bottom; 1362 $self->{textview}->scroll_to_bottom;
1363 }
1364
1096 $self->update_options; 1365 $self->update_options;
1097 } else { 1366 } else {
1098 $self->destroy; 1367 $self->destroy;
1099 } 1368 }
1100 1369
… …
1105 my ($self, $msg) = @_; 1374 my ($self, $msg) = @_;
1106 1375
1107 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1376 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1108 $self->{textview}->scroll_to_bottom; 1377 $self->{textview}->scroll_to_bottom;
1109 1378
1110 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1379 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1111} 1380}
1112 1381
1113sub destroy { 1382sub destroy {
1114 my ($self) = @_; 1383 my ($self) = @_;
1115 1384
1116 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1385 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1117 1386
1118 if ($self->{conn}) { 1387 if ($self->{conn}) {
1119 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1388 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1120 delete $self->{conn}{npc_dialog}; 1389 delete $self->{conn}{npc_dialog};
1121 $self->{conn}->disconnect_ext ($self->{id}); 1390 $self->{conn}->disconnect_ext ($self->{id});
1122 } 1391 }
1123 1392
1124 $self->SUPER::destroy; 1393 $self->SUPER::destroy;

Diff Legend

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