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.92 by root, Sat Dec 9 21:26:46 2006 UTC vs.
Revision 1.146 by root, Mon Aug 6 05:06:33 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,#d#
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 (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
58 $self->connect_ext (capabilities => sub {
59 my (%cap) = @_;
60
61 #$self->send ("setup sound 0"); # we use a different protocol
62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
68 if (my $ts = $cap{tileset}) {
69 if (my ($default) = grep $_->[2] & 1, @$ts) {
70 $self->{tileset} = $default;
71 $self->{tilesize} = $default->[3];
72 $self->setup_req (tileset => $default->[0]);
73
74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
75 my $h = int $self->{maph} * 32 / $self->{tilesize};
76
77 $self->setup_req (mapsize => "${w}x${h}");
78 }
79 }
80 });
81
82 $self->{json_coder}
83 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub {
85 $self->{widget}{$_[0]}
86 });
87
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
94 };
95 });
96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($info);
195 });
196
197 # destroy widgets on logout
198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
199 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy
201 for values %{delete $ws->{w} || {}};
202 }
203 });
204
45 $self->{map_widget}->add_command (@$_) 205 $self->{map_widget}->add_command (@$_)
46 for @cmd_help; 206 for @cmd_help;
47
48 $self->{noface} = new_from_file CFPlus::Texture
49 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
50 207
51 { 208 {
52 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 209 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
53 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 210 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
54 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 211 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
55 } 212 }
56 213
214 {
215 $self->{noface} = my $tex = new_from_file CFPlus::Texture
216 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
217 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
218 }
219
57 $self->{open_container} = 0; 220 $self->{open_container} = 0;
58 221
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 222 # per server
66 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
67 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
68 224
69 $self 225 $self
70} 226}
71 227
72sub logprint { 228sub logprint {
73 my ($self, @a) = @_; 229 my ($self, @a) = @_;
74 230
75 $self->{log_fh} ||= do { 231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
76 my $path = "$Crossfire::VARDIR/log.$self->{host}";
77
78 open my $fh, ">>:utf8", $path
79 or die "Couldn't open logfile $path: $!";
80
81 $fh->autoflush (1);
82
83 $fh;
84 };
85
86 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
87
88 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
89 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
90
91 print {$self->{log_fh}} "$ts ", @a, "\n";
92} 232}
93 233
94sub _stat_numdiff { 234sub _stat_numdiff {
95 my ($self, $name, $old, $new) = @_; 235 my ($self, $name, $old, $new) = @_;
96 236
229 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 369 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
230 $::GAUGES->{food} ->set_value ($fo, $fo_m); 370 $::GAUGES->{food} ->set_value ($fo, $fo_m);
231 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 371 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
232 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 372 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
233 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 373 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
234 my $rng = $stats->{+CS_STAT_RANGE}; 374 $::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}; 375 my $title = $stats->{+CS_STAT_TITLE};
238 $title =~ s/^Player: //; 376 $title =~ s/^Player: //;
239 $::STATWIDS->{title} ->set_text ("Title: " . $title); 377 $::STATWIDS->{title} ->set_text ("Title: " . $title);
240 378
241 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 379 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
261 my @skills = keys %{ $self->{skill_info} }; 399 my @skills = keys %{ $self->{skill_info} };
262 400
263 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 401 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
264 $sktbl->clear; 402 $sktbl->clear;
265 403
404 my @add;
405
406 push @add,
266 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
267 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 408 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
268 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
269 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
270 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 411 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
271 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
413 ;
272 414
273 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 415 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
274 416
275 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 417 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); 418 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
304 } 446 }
305 447
306 1 448 1
307 }; 449 };
308 450
451 push @add,
309 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 452 $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); 453 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 454 $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); 455 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, 456 $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); 457 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
458 ;
315 459
316 $x++ and ($x, $y) = (0, $y + 1); 460 $x++ and ($x, $y) = (0, $y + 1);
317 } 461 }
462
463 $sktbl->add_at (@add);
318 } 464 }
319 465
320 for (grep exists $stats->{$_}, @skills) { 466 for (grep exists $stats->{$_}, @skills) {
321 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
322 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
374 or return; 520 or return;
375 521
376 my ($hash, $x, $y, $w, $h) = @$map_info; 522 my ($hash, $x, $y, $w, $h) = @$map_info;
377 523
378 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 524 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
379 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 525 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
380 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 526 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
381} 527}
382 528
383sub map_clear { 529sub map_clear {
384 my ($self) = @_; 530 my ($self) = @_;
388 534
389 $self->{map}->clear; 535 $self->{map}->clear;
390 delete $self->{map_widget}{magicmap}; 536 delete $self->{map_widget}{magicmap};
391} 537}
392 538
539sub bg_fetch {
540 my ($self) = @_;
541
542 my $id;
543
544 do {
545 $id = pop @{$self->{bg_fetch}}
546 or return;
547 } while $self->{texture}[$id];
548
549 CFPlus::DB::exists tilecache => $id, sub {
550 my ($exists) = @_;
551
552 return unless $self->{map}; # stop when destroyed
553
554 $self->have_tile ($id)
555 if $exists;
556
557 $self->bg_fetch;
558 };
559}
393 560
394sub load_map($$$) { 561sub load_map($$$) {
395 my ($self, $hash, $x, $y) = @_; 562 my ($self, $hash, $x, $y) = @_;
396 563
397 if (defined (my $data = $self->{mapcache}->get ($hash))) { 564 my $gen = $self->{map_change_gen};
565
566 CFPlus::DB::get $self->{mapcache} => $hash, sub {
567 return unless $gen == $self->{map_change_gen};
568
569 my ($data) = @_;
570
571 if (defined $data) {
398 $data = Compress::LZF::decompress $data; 572 $data = Compress::LZF::decompress $data;
399 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 573 #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 574
404 $self->set_texture ($id => $data); 575 my $inprogress = @{ $self->{bg_fetch} || [] };
576 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
577 $self->bg_fetch unless $inprogress;
405 } 578 }
406 } 579 };
407} 580}
408 581
409# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 582# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
410# (server resource,s latency, bandwidth), so this hack is warranted. 583# (server resource,s latency, bandwidth), so this hack is warranted.
411# the right fix is to make real tiled maps with an overview file 584# the right fix is to make real tiled maps with an overview file
475 648
476 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 649 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
477 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 650 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
478 651
479 } else { 652 } else {
653 my $gen = $self->{map_change_gen};
480 $self->send_mapinfo ("spatial $path$tile", sub { 654 $self->send_mapinfo ("spatial $path$tile", sub {
655 return unless $gen == $self->{map_change_gen};
656
481 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 657 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
482 658
483 return if $mode ne "spatial"; 659 return if $mode ne "spatial";
484 660
485 $x += $self->{map}->ox; 661 $x += $self->{map}->ox;
499 675
500sub map_change { 676sub map_change {
501 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 677 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
502 678
503 $self->flush_map; 679 $self->flush_map;
680
681 ++$self->{map_change_gen};
504 682
505 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 683 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
506 684
507 my $mapmapw = $self->{mapmap}->{w}; 685 my $mapmapw = $self->{mapmap}->{w};
508 my $mapmaph = $self->{mapmap}->{h}; 686 my $mapmaph = $self->{mapmap}->{h};
525 $self->load_map ($hash, $x, $y); 703 $self->load_map ($hash, $x, $y);
526 $self->flood_fill (0, 0, 0, "", $hash, $flags); 704 $self->flood_fill (0, 0, 0, "", $hash, $flags);
527} 705}
528 706
529sub face_find { 707sub face_find {
530 my ($self, $facenum, $face) = @_; 708 my ($self, $facenum, $face, $cb) = @_;
531 709
532 my $hash = "$face->{chksum},$face->{name}"; 710 if ($face->{type} == 0) { # FT_FACE
711 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
533 712
534 my $id = $self->{facemap}->get ($hash); 713 $face->{id} = $id;
535
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;
559 $self->{map}->set_face ($facenum => $id);
560 $self->{faceid}[$facenum] = $id;#d# 714 $self->{faceid}[$facenum] = $id;
561 715
562 my $face = $self->{tilecache}->get ($id); 716 $self->{map}->set_tileid ($facenum => $id);
563 717
564 if ($face) { 718 CFPlus::DB::get tilecache => $id, $cb;
565 #$self->face_prefetch; 719
566 $face 720 } elsif ($face->{type} & 1) { # with metadata
567 } else { 721 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
568 my $tex = $self->{noface}; 722 CFPlus::DB::get res_meta => $face->{name}, $cb;
569 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
570 undef
571 }; 723 }
572} 724}
573 725
574sub face_update { 726sub face_update {
575 my ($self, $facenum, $face, $changed) = @_; 727 my ($self, $facenum, $face, $changed) = @_;
576 728
577 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 729 if ($face->{type} == 0) { # FT_FACE
730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
731 if $changed;
578 732
579 $self->set_texture ($face->{id} => delete $face->{image}); 733 $self->have_tile ($face->{id});
580}
581 734
582sub set_texture { 735 } elsif ($face->{type} & 1) { # split metadata
736 my $cb = sub { };
737
738 if ($face->{type} == 3) { # FT_MUSIC
739 $cb = sub {
740 $self->{music_meta}{$facenum} = $face;
741
742 ::message ({ markup => "downloaded song #$facenum" })
743 if $changed;
744
745 &::audio_music_push ($facenum);
746 };
747 } elsif ($face->{type} == 5) { # FT_SOUND
748 $cb = sub {
749 $self->{sound_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded sound #$facenum" })
752 if $changed;
753
754 &::audio_sound_push ($facenum);
755 };
756 }
757
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760
761 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
763 $face->{meta} = $self->{json_coder}->decode ($meta_json);
764 ::add_license ($face);
765 $cb->();
766 };
767
768 } else {
769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
770 ::add_license ($face);
771 $cb->();
772 }
773 }
774}
775
776sub smooth_update {
777 my ($self, $facenum, $face) = @_;
778
779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
780}
781
782sub have_tile {
783 my ($self, $tile) = @_;
784
785 return unless $self->{map};
786
787 $self->{texture}[$tile] ||= my $tex =
788 new CFPlus::Texture
789 tile => $tile, minify => 1, mipmap => 1, delay => 1;
790
791 $_->() for @{(delete $self->{face_cb}{$tile}) || []};
792}
793
794sub connect_face_update {
583 my ($self, $id, $data) = @_; 795 my ($self, $id, $cb) = @_;
584 796
585 $self->{texture}[$id] ||= do { 797 push @{$self->{face_cb}{$id}}, $cb;
586 my $tex =
587 new_from_image CFPlus::Texture
588 $data, minify => 1, mipmap => 1;
589 798
590 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 799 CFPlus::guard {
591 $self->{map_widget}->update; 800 @{$self->{face_cb}{$id}}
592 801 = grep $_ != $cb,
593 $tex 802 @{$self->{face_cb}{$id}};
594 }; 803 }
595} 804}
596 805
597sub sound_play { 806sub sound_play {
598 my ($self, $x, $y, $soundnum, $type) = @_; 807 my ($self, $type, $face, $dx, $dy, $vol) = @_;
599 808
600 $self->{sound_play}->($x, $y, $soundnum, $type); 809 &::audio_sound_play ($face, $dx, $dy, $vol)
810 unless $type & 1; # odd types are silent for future expansion
601} 811}
602 812
603my $LAST_QUERY; # server is stupid, stupid, stupid 813my $LAST_QUERY; # server is stupid, stupid, stupid
604 814
605sub query { 815sub query {
609 $LAST_QUERY = $prompt; 819 $LAST_QUERY = $prompt;
610 820
611 $self->{query}-> ($self, $flags, $prompt); 821 $self->{query}-> ($self, $flags, $prompt);
612} 822}
613 823
614sub drawinfo { 824sub sanitise_xml($) {
615 my ($self, $color, $text) = @_; 825 local $_ = shift;
616 826
617 my @color = ( 827 # we now weed out all tags we do not support
828 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
829 # now all entities
830 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
831
832 # handle some elements
833 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
834 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
835
836 $_
837}
838
839our %NAME_TO_COLOR = (
840 black => 0,
841 white => 1,
842 darkblue => 2,
843 red => 3,
844 orange => 4,
845 lightblue => 5,
846 darkorange => 6,
847 green => 7,
848 darkgreen => 8,
849 grey => 9,
850 brown => 10,
851 yellow => 11,
852 tan => 12,
853);
854
855our @CF_COLOR = (
618 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 856 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
619 [1.00, 1.00, 1.00], 857 [1.00, 1.00, 1.00],
620 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 858 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
621 [1.00, 0.00, 0.00], 859 [1.00, 0.00, 0.00],
622 [1.00, 0.54, 0.00], 860 [1.00, 0.54, 0.00],
623 [0.11, 0.56, 1.00], 861 [0.11, 0.56, 1.00],
624 [0.93, 0.46, 0.00], 862 [0.93, 0.46, 0.00],
625 [0.18, 0.54, 0.34], 863 [0.18, 0.54, 0.34],
626 [0.56, 0.73, 0.56], 864 [0.56, 0.73, 0.56],
627 [0.80, 0.80, 0.80], 865 [0.80, 0.80, 0.80],
628 [0.75, 0.61, 0.20], 866 [0.75, 0.61, 0.20],
629 [0.99, 0.77, 0.26], 867 [0.99, 0.77, 0.26],
630 [0.74, 0.65, 0.41], 868 [0.74, 0.65, 0.41],
631 ); 869);
632 870
871sub msg {
872 my ($self, $color, $type, $text, @extra) = @_;
873
874 $text = sanitise_xml $text;
875
876 if (my $cb = $self->{cb_msg}{$type}) {
877 $_->($self, $color, $type, $text, @extra) for values %$cb;
878 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
879 $type =~ s/-/_/g;
880 $self->{$type} = $text;
881 } else {
633 $self->logprint ("info: ", $text); 882 $self->logprint ("msg: ", $text);
883 return if $color < 0; # negative color == ignore if not understood
634 884
885 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
886
635 # try to create single paragraphs of multiple lines sent by the server 887 ## try to create single paragraphs of multiple lines sent by the server
888 # no longer neecssary with TRT servers
636 $text =~ s/(?<=\S)\n(?=\w)/ /g; 889 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
637 890
638 $text = CFPlus::asxml $text; 891 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
639 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
640 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
641
642 ::message ({ fg => $color[$color], markup => $_ })
643 for split /\n/, $text; 892 for split /\n/, $text;
644 893
645 $self->{statusbox}->add ($text, 894 $self->{statusbox}->add ($text,
646 group => $text, 895 group => $text,
647 fg => $color[$color], 896 fg => $fg,
648 timeout => $color >= 2 ? 180 : 10, 897 timeout => $color >= 2 ? 180 : 10,
649 tooltip_font => $::FONT_FIXED, 898 tooltip_font => $::FONT_FIXED,
650 ); 899 );
651} 900 }
652
653sub drawextinfo {
654 my ($self, $color, $type, $subtype, $message) = @_;
655
656 $self->drawinfo ($color, $message);
657} 901}
658 902
659sub spell_add { 903sub spell_add {
660 my ($self, $spell) = @_; 904 my ($self, $spell) = @_;
661 905
677} 921}
678 922
679sub setup { 923sub setup {
680 my ($self, $setup) = @_; 924 my ($self, $setup) = @_;
681 925
926 $self->{map_widget}->set_tilesize ($self->{tilesize});
682 $::MAP->resize ($self->{mapw}, $self->{maph}); 927 $::MAP->resize ($self->{mapw}, $self->{maph});
683} 928}
684 929
685sub addme_success { 930sub addme_success {
686 my ($self) = @_; 931 my ($self) = @_;
708 $self->{map_widget}->clr_commands; 953 $self->{map_widget}->clr_commands;
709 954
710 ::stop_game (); 955 ::stop_game ();
711} 956}
712 957
713sub image_info {
714 my ($self, $numfaces) = @_;
715
716 $self->{num_faces} = $numfaces;
717 $self->{face_prefetch} = [1 .. $numfaces];
718 $self->face_prefetch;
719}
720
721sub face_prefetch {
722 my ($self) = @_;
723
724 return unless $::CFG->{face_prefetch};
725
726 if ($self->{num_faces}) {
727 return if @{ $self->{send_queue} || [] };
728 my $todo = @{ $self->{face_prefetch} }
729 or return;
730
731 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
732
733 $self->send ("requestinfo image_sums $face $face");
734
735 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
736 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
737 } elsif (!exists $self->{num_faces}) {
738 $self->send ("requestinfo image_info");
739
740 $self->{num_faces} = 0;
741
742 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
743 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
744 }
745}
746
747sub update_floorbox { 958sub update_floorbox {
748 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 959 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
749 return unless $::CONN; 960 return unless $::CONN;
750 961
751 $::FLOORBOX->clear; 962 $::FLOORBOX->clear;
963
964 my @add;
752 965
753 my $row; 966 my $row;
754 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 967 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
755 if ($row < 6) { 968 if ($row < 6) {
756 local $_->{face_widget}; # hack to force recreation of widget 969 local $_->{face_widget}; # hack to force recreation of widget
757 local $_->{desc_widget}; # hack to force recreation of widget 970 local $_->{desc_widget}; # hack to force recreation of widget
758 CFPlus::Item::update_widgets $_; 971 CFPlus::Item::update_widgets $_;
759 972
973 push @add,
760 $::FLOORBOX->add (0, $row, $_->{face_widget}); 974 0, $row, $_->{face_widget},
761 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 975 1, $row, $_->{desc_widget};
762 976
763 $row++; 977 $row++;
764 } else { 978 } else {
765 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 979 push @add, 1, $row, new CFPlus::UI::Button
766 text => "More...", 980 text => "More...",
767 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 981 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
768 ); 982 ;
769 last; 983 last;
770 } 984 }
771 } 985 }
772 if ($::CONN->{open_container}) { 986 if ($::CONN->{open_container}) {
773 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 987 push @add, 1, $row++, new CFPlus::UI::Button
774 text => "Close container", 988 text => "Close container",
775 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 989 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
776 ); 990 ;
777 } 991 }
992
993 $::FLOORBOX->add_at (@add);
778 }); 994 });
779 995
780 $::WANT_REFRESH++; 996 $::WANT_REFRESH++;
781} 997}
782 998
893 $::SERVER_INFO->set_markup ( 1109 $::SERVER_INFO->set_markup (
894 "server <tt>$self->{host}:$self->{port}</tt>\n" 1110 "server <tt>$self->{host}:$self->{port}</tt>\n"
895 . "protocol version <tt>$self->{version}</tt>\n" 1111 . "protocol version <tt>$self->{version}</tt>\n"
896 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1112 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
897 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1113 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1114 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
898 . "editing support $yesno[!!$self->{editor_support}]\n" 1115 . "editing support $yesno[!!$self->{editor_support}]\n"
899 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1116 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1117 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
900 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1118 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
901 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1119 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
902 . "map size $self->{mapw}×$self->{maph}\n" 1120 . "map size $self->{mapw}×$self->{maph}\n"
903 ); 1121 );
904 1122
905 ::setup_build_button ($self->{editor_support}->{builder_ui});
906} 1123}
907 1124
908sub logged_in { 1125sub logged_in {
909 my ($self) = @_; 1126 my ($self) = @_;
910 1127
911 $self->send_ext_req (cfplus_support => version => 1, sub { 1128 $self->send_ext_req (cfplus_support => version => 2, sub {
1129 my (%msg) = @_;
1130
912 $self->{cfplus_ext} = $_[0]{version}; 1131 $self->{cfplus_ext} = $msg{version};
913 $self->update_server_info; 1132 $self->update_server_info;
914 1133
915 if ($self->{cfplus_ext} >= 2) { 1134 if ($self->{cfplus_ext} >= 2) {
916 $self->send_ext_req ("editor_support", sub { 1135 $self->send_ext_req ("editor_support", sub {
917 $self->{editor_support} = $_[0]; 1136 $self->{editor_support} = { @_ };
918 $self->update_server_info; 1137 $self->update_server_info;
919 1138
920 0 1139 0
921 }); 1140 });
922 } 1141 }
926 1145
927 $self->update_server_info; 1146 $self->update_server_info;
928 1147
929 $self->send_command ("output-sync $::CFG->{output_sync}"); 1148 $self->send_command ("output-sync $::CFG->{output_sync}");
930 $self->send_command ("output-count $::CFG->{output_count}"); 1149 $self->send_command ("output-count $::CFG->{output_count}");
1150 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
931 $self->send_command ("pickup $::CFG->{pickup}"); 1151 $self->send_command ("pickup $::CFG->{pickup}");
932}
933
934sub buildat {
935 my ($self, $builditem, $x, $y) = @_;
936
937 if ($self->{cfplus_ext}) {
938 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
939 }
940} 1152}
941 1153
942sub lookat { 1154sub lookat {
943 my ($self, $x, $y) = @_; 1155 my ($self, $x, $y) = @_;
944 1156
945 if ($self->{cfplus_ext}) { 1157 if ($self->{cfplus_ext}) {
946 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1158 $self->send_ext_req (lookat => $x, $y, sub {
947 my ($msg) = @_; 1159 my (%msg) = @_;
948 1160
949 if (exists $msg->{npc_dialog}) { 1161 if (exists $msg{npc_dialog}) {
950 # start npc chat dialog 1162 # start npc chat dialog
951 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1163 $self->{npc_dialog} = new CFPlus::NPCDialog::
952 dx => $x, 1164 token => $msg{npc_dialog},
953 dy => $y,
954 title => "$msg->{npc_dialog} (NPC)", 1165 title => "$msg{npc_dialog}[0] (NPC)",
955 conn => $self, 1166 conn => $self,
956 ; 1167 ;
957 } 1168 }
958 }); 1169 });
959 } 1170 }
966 1177
967 (delete $self->{npc_dialog})->destroy 1178 (delete $self->{npc_dialog})->destroy
968 if $self->{npc_dialog}; 1179 if $self->{npc_dialog};
969 1180
970 $self->SUPER::destroy; 1181 $self->SUPER::destroy;
1182
1183 %$self = ();
971} 1184}
972 1185
973package CFPlus::NPCDialog; 1186package CFPlus::NPCDialog;
974 1187
975our @ISA = 'CFPlus::UI::Toplevel'; 1188our @ISA = 'CFPlus::UI::Toplevel';
1022 on_activate => sub { $this->destroy; 1 }, 1235 on_activate => sub { $this->destroy; 1 },
1023 ; 1236 ;
1024 1237
1025 $self->update_options; 1238 $self->update_options;
1026 1239
1027 $self->{id} = $self->{conn}->send_ext_req ( 1240 $self->{id} = "npc-channel-" . $self->{conn}->token;
1028 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1241 $self->{conn}->connect_ext ($self->{id} => sub {
1029 sub { $this && $this->feed (@_) } 1242 $this->feed (@_) if $this;
1030 ); 1243 });
1244
1245 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1031 1246
1032 $self->{entry}->grab_focus; 1247 $self->{entry}->grab_focus;
1033 1248
1034 $self->{textview}->add_paragraph ({ 1249 $self->{textview}->add_paragraph ({
1035 fg => [1, 1, 0, 1], 1250 fg => [1, 1, 0, 1],
1058 ); 1273 );
1059 } 1274 }
1060} 1275}
1061 1276
1062sub feed { 1277sub feed {
1063 my ($self, $msg) = @_; 1278 my ($self, $type, @arg) = @_;
1064 1279
1065 CFPlus::weaken $self; 1280 CFPlus::weaken $self;
1066 1281
1067 if ($msg->{msgtype} eq "reply") { 1282 if ($type eq "update") {
1283 my (%info) = @arg;
1284
1068 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1285 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1069 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1286 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1070
1071 my $text = "\n" . CFPlus::asxml $msg->{msg};
1072 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1073 my @link;
1074 $text =~ s{
1075 ($match)
1076 }{
1077 my $kw = $1;
1078
1079 push @link, new CFPlus::UI::Label
1080 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1081 can_hover => 1,
1082 can_events => 1,
1083 padding_x => 0,
1084 padding_y => 0,
1085 on_button_up => sub {
1086 $self->send ($kw);
1087 };
1088
1089 "\x{fffc}"
1090 }giex;
1091 1287
1288 if (exists $info{msg}) {
1289 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1290 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1291 my @link;
1292 $text =~ s{
1293 ($match)
1294 }{
1295 my $kw = $1;
1296
1297 push @link, new CFPlus::UI::Label
1298 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1299 can_hover => 1,
1300 can_events => 1,
1301 padding_x => 0,
1302 padding_y => 0,
1303 on_button_up => sub {
1304 $self->send ($kw);
1305 };
1306
1307 "\x{fffc}"
1308 }giex;
1309
1092 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1310 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1093 $self->{textview}->scroll_to_bottom; 1311 $self->{textview}->scroll_to_bottom;
1312 }
1313
1094 $self->update_options; 1314 $self->update_options;
1095 } else { 1315 } else {
1096 $self->destroy; 1316 $self->destroy;
1097 } 1317 }
1098 1318
1103 my ($self, $msg) = @_; 1323 my ($self, $msg) = @_;
1104 1324
1105 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1325 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1106 $self->{textview}->scroll_to_bottom; 1326 $self->{textview}->scroll_to_bottom;
1107 1327
1108 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1328 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1109} 1329}
1110 1330
1111sub destroy { 1331sub destroy {
1112 my ($self) = @_; 1332 my ($self) = @_;
1113 1333
1114 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1334 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1115 1335
1116 if ($self->{conn}) { 1336 if ($self->{conn}) {
1117 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1337 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1118 delete $self->{conn}{npc_dialog}; 1338 delete $self->{conn}{npc_dialog};
1119 $self->{conn}->disconnect_ext ($self->{id}); 1339 $self->{conn}->disconnect_ext ($self->{id});
1120 } 1340 }
1121 1341
1122 $self->SUPER::destroy; 1342 $self->SUPER::destroy;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines