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.95 by root, Wed Apr 4 02:43:30 2007 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
45 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
46 my ($cap) = @_; 59 my (%cap) = @_;
47 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
48 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
49 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
50 $self->{tileset} = $default; 70 $self->{tileset} = $default;
51 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
52 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
53 73
54 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
55 my $h = int $self->{maph} * 32 / $self->{tilesize}; 75 my $h = int $self->{maph} * 32 / $self->{tilesize};
56 76
57 $self->setup_req (mapsize => "${w}x${h}"); 77 $self->setup_req (mapsize => "${w}x${h}");
58 } 78 }
59 } 79 }
60 }); 80 });
61 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
62 $self->{map_widget}->add_command (@$_) 205 $self->{map_widget}->add_command (@$_)
63 for @cmd_help; 206 for @cmd_help;
64
65 $self->{noface} = new_from_file CFPlus::Texture
66 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
67 207
68 { 208 {
69 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 209 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
70 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 210 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
71 $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}});
72 } 212 }
73 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
74 $self->{open_container} = 0; 220 $self->{open_container} = 0;
75 221
76 # "global"
77 $self->{tilecache} = CFPlus::db_table "tilecache"
78 or die "tilecache: unable to open database table";
79 $self->{facemap} = CFPlus::db_table "facemap"
80 or die "facemap: unable to open database table";
81
82 # per server 222 # per server
83 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
84 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
85 224
86 $self 225 $self
87} 226}
88 227
89sub logprint { 228sub logprint {
90 my ($self, @a) = @_; 229 my ($self, @a) = @_;
91 230
92 $self->{log_fh} ||= do { 231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
93 my $path = "$Crossfire::VARDIR/log.$self->{host}";
94
95 open my $fh, ">>:utf8", $path
96 or die "Couldn't open logfile $path: $!";
97
98 $fh->autoflush (1);
99
100 $fh;
101 };
102
103 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
104
105 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
106 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
107
108 print {$self->{log_fh}} "$ts ", @a, "\n";
109} 232}
110 233
111sub _stat_numdiff { 234sub _stat_numdiff {
112 my ($self, $name, $old, $new) = @_; 235 my ($self, $name, $old, $new) = @_;
113 236
… …
246 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 369 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
247 $::GAUGES->{food} ->set_value ($fo, $fo_m); 370 $::GAUGES->{food} ->set_value ($fo, $fo_m);
248 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 371 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
249 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 372 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
250 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 373 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
251 my $rng = $stats->{+CS_STAT_RANGE}; 374 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
252 $rng =~ s/^Range: //; # thank you so much dear server
253 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
254 my $title = $stats->{+CS_STAT_TITLE}; 375 my $title = $stats->{+CS_STAT_TITLE};
255 $title =~ s/^Player: //; 376 $title =~ s/^Player: //;
256 $::STATWIDS->{title} ->set_text ("Title: " . $title); 377 $::STATWIDS->{title} ->set_text ("Title: " . $title);
257 378
258 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 379 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
278 my @skills = keys %{ $self->{skill_info} }; 399 my @skills = keys %{ $self->{skill_info} };
279 400
280 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 401 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
281 $sktbl->clear; 402 $sktbl->clear;
282 403
404 my @add;
405
406 push @add,
283 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
284 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 408 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
285 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
286 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
287 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 411 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
288 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
413 ;
289 414
290 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>";
291 416
292 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);
293 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);
… …
321 } 446 }
322 447
323 1 448 1
324 }; 449 };
325 450
451 push @add,
326 $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
327 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),
328 $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
329 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),
330 $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,
331 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 ;
332 459
333 $x++ and ($x, $y) = (0, $y + 1); 460 $x++ and ($x, $y) = (0, $y + 1);
334 } 461 }
462
463 $sktbl->add_at (@add);
335 } 464 }
336 465
337 for (grep exists $stats->{$_}, @skills) { 466 for (grep exists $stats->{$_}, @skills) {
338 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
339 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
391 or return; 520 or return;
392 521
393 my ($hash, $x, $y, $w, $h) = @$map_info; 522 my ($hash, $x, $y, $w, $h) = @$map_info;
394 523
395 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 524 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
396 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 525 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
397 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 526 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
398} 527}
399 528
400sub map_clear { 529sub map_clear {
401 my ($self) = @_; 530 my ($self) = @_;
… …
405 534
406 $self->{map}->clear; 535 $self->{map}->clear;
407 delete $self->{map_widget}{magicmap}; 536 delete $self->{map_widget}{magicmap};
408} 537}
409 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}
410 560
411sub load_map($$$) { 561sub load_map($$$) {
412 my ($self, $hash, $x, $y) = @_; 562 my ($self, $hash, $x, $y) = @_;
413 563
414 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) {
415 $data = Compress::LZF::decompress $data; 572 $data = Compress::LZF::decompress $data;
416 #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#
417 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
418 my $data = $self->{tilecache}->get ($id)
419 or next;
420 574
421 $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;
422 } 578 }
423 } 579 };
424} 580}
425 581
426# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 582# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
427# (server resource,s latency, bandwidth), so this hack is warranted. 583# (server resource,s latency, bandwidth), so this hack is warranted.
428# 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
… …
492 648
493 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 649 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
494 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 650 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
495 651
496 } else { 652 } else {
653 my $gen = $self->{map_change_gen};
497 $self->send_mapinfo ("spatial $path$tile", sub { 654 $self->send_mapinfo ("spatial $path$tile", sub {
655 return unless $gen == $self->{map_change_gen};
656
498 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 657 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
499 658
500 return if $mode ne "spatial"; 659 return if $mode ne "spatial";
501 660
502 $x += $self->{map}->ox; 661 $x += $self->{map}->ox;
… …
516 675
517sub map_change { 676sub map_change {
518 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 677 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
519 678
520 $self->flush_map; 679 $self->flush_map;
680
681 ++$self->{map_change_gen};
521 682
522 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 683 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
523 684
524 my $mapmapw = $self->{mapmap}->{w}; 685 my $mapmapw = $self->{mapmap}->{w};
525 my $mapmaph = $self->{mapmap}->{h}; 686 my $mapmaph = $self->{mapmap}->{h};
… …
542 $self->load_map ($hash, $x, $y); 703 $self->load_map ($hash, $x, $y);
543 $self->flood_fill (0, 0, 0, "", $hash, $flags); 704 $self->flood_fill (0, 0, 0, "", $hash, $flags);
544} 705}
545 706
546sub face_find { 707sub face_find {
547 my ($self, $facenum, $face) = @_; 708 my ($self, $facenum, $face, $cb) = @_;
548 709
549 my $hash = "$face->{chksum},$face->{name}"; 710 if ($face->{type} == 0) { # FT_FACE
711 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
550 712
551 my $id = $self->{facemap}->get ($hash); 713 $face->{id} = $id;
552
553 unless ($id) {
554 # create new id for face
555 # I love transactions
556 for (1..100) {
557 my $txn = $CFPlus::DB_ENV->txn_begin;
558 my $status = $self->{facemap}->db_get (id => $id);
559 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
560 $id = ($id || 64) + 1;
561 if ($self->{facemap}->put (id => $id) == 0
562 && $self->{facemap}->put ($hash => $id) == 0) {
563 $txn->txn_commit;
564
565 goto gotid;
566 }
567 }
568 $txn->txn_abort;
569 }
570
571 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
572 }
573
574gotid:
575 $face->{id} = $id;
576 $self->{map}->set_face ($facenum => $id);
577 $self->{faceid}[$facenum] = $id;#d# 714 $self->{faceid}[$facenum] = $id;
578 715
579 my $face = $self->{tilecache}->get ($id); 716 $self->{map}->set_tileid ($facenum => $id);
580 717
581 if ($face) { 718 CFPlus::DB::get tilecache => $id, $cb;
582 #$self->face_prefetch; 719
583 $face 720 } elsif ($face->{type} & 1) { # with metadata
584 } else { 721 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
585 my $tex = $self->{noface}; 722 CFPlus::DB::get res_meta => $face->{name}, $cb;
586 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
587 undef
588 }; 723 }
589} 724}
590 725
591sub face_update { 726sub face_update {
592 my ($self, $facenum, $face, $changed) = @_; 727 my ($self, $facenum, $face, $changed) = @_;
593 728
594 $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;
595 732
596 $self->set_texture ($face->{id} => delete $face->{image}); 733 $self->have_tile ($face->{id});
597}
598 734
599sub 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 {
600 my ($self, $id, $data) = @_; 795 my ($self, $id, $cb) = @_;
601 796
602 $self->{texture}[$id] ||= do { 797 push @{$self->{face_cb}{$id}}, $cb;
603 my $tex =
604 new_from_image CFPlus::Texture
605 $data, minify => 1, mipmap => 1;
606 798
607 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 799 CFPlus::guard {
608 $self->{map_widget}->update; 800 @{$self->{face_cb}{$id}}
609 801 = grep $_ != $cb,
610 $tex 802 @{$self->{face_cb}{$id}};
611 }; 803 }
612} 804}
613 805
614sub sound_play { 806sub sound_play {
615 my ($self, $x, $y, $soundnum, $type) = @_; 807 my ($self, $type, $face, $dx, $dy, $vol) = @_;
616 808
617 $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
618} 811}
619 812
620my $LAST_QUERY; # server is stupid, stupid, stupid 813my $LAST_QUERY; # server is stupid, stupid, stupid
621 814
622sub query { 815sub query {
… …
626 $LAST_QUERY = $prompt; 819 $LAST_QUERY = $prompt;
627 820
628 $self->{query}-> ($self, $flags, $prompt); 821 $self->{query}-> ($self, $flags, $prompt);
629} 822}
630 823
631sub drawinfo { 824sub sanitise_xml($) {
632 my ($self, $color, $text) = @_; 825 local $_ = shift;
633 826
634 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 = (
635 [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],
636 [1.00, 1.00, 1.00], 857 [1.00, 1.00, 1.00],
637 [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]
638 [1.00, 0.00, 0.00], 859 [1.00, 0.00, 0.00],
639 [1.00, 0.54, 0.00], 860 [1.00, 0.54, 0.00],
640 [0.11, 0.56, 1.00], 861 [0.11, 0.56, 1.00],
641 [0.93, 0.46, 0.00], 862 [0.93, 0.46, 0.00],
642 [0.18, 0.54, 0.34], 863 [0.18, 0.54, 0.34],
643 [0.56, 0.73, 0.56], 864 [0.56, 0.73, 0.56],
644 [0.80, 0.80, 0.80], 865 [0.80, 0.80, 0.80],
645 [0.75, 0.61, 0.20], 866 [0.75, 0.61, 0.20],
646 [0.99, 0.77, 0.26], 867 [0.99, 0.77, 0.26],
647 [0.74, 0.65, 0.41], 868 [0.74, 0.65, 0.41],
648 ); 869);
649 870
650 my $fg = $color[$color % @color]; 871sub msg {
872 my ($self, $color, $type, $text, @extra) = @_;
651 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 {
652 $self->logprint ("info: ", $text); 882 $self->logprint ("msg: ", $text);
883 return if $color < 0; # negative color == ignore if not understood
653 884
885 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
886
654 # 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
655 $text =~ s/(?<=\S)\n(?=\w)/ /g; 889 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
656 890
657 $text = CFPlus::asxml $text; 891 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
658 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
659 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
660
661 ::message ({ fg => $fg, markup => $_ })
662 for split /\n/, $text; 892 for split /\n/, $text;
663 893
664 $self->{statusbox}->add ($text, 894 $self->{statusbox}->add ($text,
665 group => $text, 895 group => $text,
666 fg => $fg, 896 fg => $fg,
667 timeout => $color >= 2 ? 180 : 10, 897 timeout => $color >= 2 ? 180 : 10,
668 tooltip_font => $::FONT_FIXED, 898 tooltip_font => $::FONT_FIXED,
669 ); 899 );
670} 900 }
671
672sub drawextinfo {
673 my ($self, $color, $type, $subtype, $message) = @_;
674
675 $self->drawinfo ($color, $message);
676} 901}
677 902
678sub spell_add { 903sub spell_add {
679 my ($self, $spell) = @_; 904 my ($self, $spell) = @_;
680 905
… …
728 $self->{map_widget}->clr_commands; 953 $self->{map_widget}->clr_commands;
729 954
730 ::stop_game (); 955 ::stop_game ();
731} 956}
732 957
733sub image_info {
734 my ($self, $numfaces) = @_;
735
736 $self->{num_faces} = $numfaces;
737 $self->{face_prefetch} = [1 .. $numfaces];
738 $self->face_prefetch;
739}
740
741sub face_prefetch {
742 my ($self) = @_;
743
744 return unless $::CFG->{face_prefetch};
745
746 if ($self->{num_faces}) {
747 return if @{ $self->{send_queue} || [] };
748 my $todo = @{ $self->{face_prefetch} }
749 or return;
750
751 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
752
753 $self->send ("requestinfo image_sums $face $face");
754
755 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
756 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
757 } elsif (!exists $self->{num_faces}) {
758 $self->send ("requestinfo image_info");
759
760 $self->{num_faces} = 0;
761
762 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
763 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
764 }
765}
766
767sub update_floorbox { 958sub update_floorbox {
768 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 959 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
769 return unless $::CONN; 960 return unless $::CONN;
770 961
771 $::FLOORBOX->clear; 962 $::FLOORBOX->clear;
963
964 my @add;
772 965
773 my $row; 966 my $row;
774 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} }) {
775 if ($row < 6) { 968 if ($row < 6) {
776 local $_->{face_widget}; # hack to force recreation of widget 969 local $_->{face_widget}; # hack to force recreation of widget
777 local $_->{desc_widget}; # hack to force recreation of widget 970 local $_->{desc_widget}; # hack to force recreation of widget
778 CFPlus::Item::update_widgets $_; 971 CFPlus::Item::update_widgets $_;
779 972
973 push @add,
780 $::FLOORBOX->add (0, $row, $_->{face_widget}); 974 0, $row, $_->{face_widget},
781 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 975 1, $row, $_->{desc_widget};
782 976
783 $row++; 977 $row++;
784 } else { 978 } else {
785 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 979 push @add, 1, $row, new CFPlus::UI::Button
786 text => "More...", 980 text => "More...",
787 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 981 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
788 ); 982 ;
789 last; 983 last;
790 } 984 }
791 } 985 }
792 if ($::CONN->{open_container}) { 986 if ($::CONN->{open_container}) {
793 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 987 push @add, 1, $row++, new CFPlus::UI::Button
794 text => "Close container", 988 text => "Close container",
795 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 989 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
796 ); 990 ;
797 } 991 }
992
993 $::FLOORBOX->add_at (@add);
798 }); 994 });
799 995
800 $::WANT_REFRESH++; 996 $::WANT_REFRESH++;
801} 997}
802 998
… …
913 $::SERVER_INFO->set_markup ( 1109 $::SERVER_INFO->set_markup (
914 "server <tt>$self->{host}:$self->{port}</tt>\n" 1110 "server <tt>$self->{host}:$self->{port}</tt>\n"
915 . "protocol version <tt>$self->{version}</tt>\n" 1111 . "protocol version <tt>$self->{version}</tt>\n"
916 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1112 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
917 . "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"
918 . "editing support $yesno[!!$self->{editor_support}]\n" 1115 . "editing support $yesno[!!$self->{editor_support}]\n"
919 . "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"
920 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1118 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
921 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1119 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
922 . "map size $self->{mapw}×$self->{maph}\n" 1120 . "map size $self->{mapw}×$self->{maph}\n"
923 ); 1121 );
924 1122
925 ::setup_build_button ($self->{editor_support}->{builder_ui});
926} 1123}
927 1124
928sub logged_in { 1125sub logged_in {
929 my ($self) = @_; 1126 my ($self) = @_;
930 1127
931 $self->send_ext_req (cfplus_support => version => 1, sub { 1128 $self->send_ext_req (cfplus_support => version => 2, sub {
1129 my (%msg) = @_;
1130
932 $self->{cfplus_ext} = $_[0]{version}; 1131 $self->{cfplus_ext} = $msg{version};
933 $self->update_server_info; 1132 $self->update_server_info;
934 1133
935 if ($self->{cfplus_ext} >= 2) { 1134 if ($self->{cfplus_ext} >= 2) {
936 $self->send_ext_req ("editor_support", sub { 1135 $self->send_ext_req ("editor_support", sub {
937 $self->{editor_support} = $_[0]; 1136 $self->{editor_support} = { @_ };
938 $self->update_server_info; 1137 $self->update_server_info;
939 1138
940 0 1139 0
941 }); 1140 });
942 } 1141 }
… …
950 $self->send_command ("output-count $::CFG->{output_count}"); 1149 $self->send_command ("output-count $::CFG->{output_count}");
951 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1150 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
952 $self->send_command ("pickup $::CFG->{pickup}"); 1151 $self->send_command ("pickup $::CFG->{pickup}");
953} 1152}
954 1153
955sub buildat {
956 my ($self, $builditem, $x, $y) = @_;
957
958 if ($self->{cfplus_ext}) {
959 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
960 }
961}
962
963sub lookat { 1154sub lookat {
964 my ($self, $x, $y) = @_; 1155 my ($self, $x, $y) = @_;
965 1156
966 if ($self->{cfplus_ext}) { 1157 if ($self->{cfplus_ext}) {
967 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1158 $self->send_ext_req (lookat => $x, $y, sub {
968 my ($msg) = @_; 1159 my (%msg) = @_;
969 1160
970 if (exists $msg->{npc_dialog}) { 1161 if (exists $msg{npc_dialog}) {
971 # start npc chat dialog 1162 # start npc chat dialog
972 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1163 $self->{npc_dialog} = new CFPlus::NPCDialog::
973 dx => $x, 1164 token => $msg{npc_dialog},
974 dy => $y,
975 title => "$msg->{npc_dialog} (NPC)", 1165 title => "$msg{npc_dialog}[0] (NPC)",
976 conn => $self, 1166 conn => $self,
977 ; 1167 ;
978 } 1168 }
979 }); 1169 });
980 } 1170 }
… …
987 1177
988 (delete $self->{npc_dialog})->destroy 1178 (delete $self->{npc_dialog})->destroy
989 if $self->{npc_dialog}; 1179 if $self->{npc_dialog};
990 1180
991 $self->SUPER::destroy; 1181 $self->SUPER::destroy;
1182
1183 %$self = ();
992} 1184}
993 1185
994package CFPlus::NPCDialog; 1186package CFPlus::NPCDialog;
995 1187
996our @ISA = 'CFPlus::UI::Toplevel'; 1188our @ISA = 'CFPlus::UI::Toplevel';
… …
1043 on_activate => sub { $this->destroy; 1 }, 1235 on_activate => sub { $this->destroy; 1 },
1044 ; 1236 ;
1045 1237
1046 $self->update_options; 1238 $self->update_options;
1047 1239
1048 $self->{id} = $self->{conn}->send_ext_req ( 1240 $self->{id} = "npc-channel-" . $self->{conn}->token;
1049 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1241 $self->{conn}->connect_ext ($self->{id} => sub {
1050 sub { $this && $this->feed (@_) } 1242 $this->feed (@_) if $this;
1051 ); 1243 });
1244
1245 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1052 1246
1053 $self->{entry}->grab_focus; 1247 $self->{entry}->grab_focus;
1054 1248
1055 $self->{textview}->add_paragraph ({ 1249 $self->{textview}->add_paragraph ({
1056 fg => [1, 1, 0, 1], 1250 fg => [1, 1, 0, 1],
… …
1079 ); 1273 );
1080 } 1274 }
1081} 1275}
1082 1276
1083sub feed { 1277sub feed {
1084 my ($self, $msg) = @_; 1278 my ($self, $type, @arg) = @_;
1085 1279
1086 CFPlus::weaken $self; 1280 CFPlus::weaken $self;
1087 1281
1088 if ($msg->{msgtype} eq "reply") { 1282 if ($type eq "update") {
1283 my (%info) = @arg;
1284
1089 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1285 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1090 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1286 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1091
1092 my $text = "\n" . CFPlus::asxml $msg->{msg};
1093 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1094 my @link;
1095 $text =~ s{
1096 ($match)
1097 }{
1098 my $kw = $1;
1099
1100 push @link, new CFPlus::UI::Label
1101 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1102 can_hover => 1,
1103 can_events => 1,
1104 padding_x => 0,
1105 padding_y => 0,
1106 on_button_up => sub {
1107 $self->send ($kw);
1108 };
1109
1110 "\x{fffc}"
1111 }giex;
1112 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
1113 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1310 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1114 $self->{textview}->scroll_to_bottom; 1311 $self->{textview}->scroll_to_bottom;
1312 }
1313
1115 $self->update_options; 1314 $self->update_options;
1116 } else { 1315 } else {
1117 $self->destroy; 1316 $self->destroy;
1118 } 1317 }
1119 1318
… …
1124 my ($self, $msg) = @_; 1323 my ($self, $msg) = @_;
1125 1324
1126 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1325 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1127 $self->{textview}->scroll_to_bottom; 1326 $self->{textview}->scroll_to_bottom;
1128 1327
1129 $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);
1130} 1329}
1131 1330
1132sub destroy { 1331sub destroy {
1133 my ($self) = @_; 1332 my ($self) = @_;
1134 1333
1135 #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
1136 1335
1137 if ($self->{conn}) { 1336 if ($self->{conn}) {
1138 $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};
1139 delete $self->{conn}{npc_dialog}; 1338 delete $self->{conn}{npc_dialog};
1140 $self->{conn}->disconnect_ext ($self->{id}); 1339 $self->{conn}->disconnect_ext ($self->{id});
1141 } 1340 }
1142 1341
1143 $self->SUPER::destroy; 1342 $self->SUPER::destroy;

Diff Legend

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