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.94 by root, Fri Mar 16 02:33:49 2007 UTC vs.
Revision 1.144 by root, Fri Aug 3 02:20:32 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 {
… …
229 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 385 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
230 $::GAUGES->{food} ->set_value ($fo, $fo_m); 386 $::GAUGES->{food} ->set_value ($fo, $fo_m);
231 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 387 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
232 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 388 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
233 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 389 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
234 my $rng = $stats->{+CS_STAT_RANGE}; 390 $::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}; 391 my $title = $stats->{+CS_STAT_TITLE};
238 $title =~ s/^Player: //; 392 $title =~ s/^Player: //;
239 $::STATWIDS->{title} ->set_text ("Title: " . $title); 393 $::STATWIDS->{title} ->set_text ("Title: " . $title);
240 394
241 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 395 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
261 my @skills = keys %{ $self->{skill_info} }; 415 my @skills = keys %{ $self->{skill_info} };
262 416
263 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 417 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
264 $sktbl->clear; 418 $sktbl->clear;
265 419
420 my @add;
421
422 push @add,
266 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 423 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
267 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 424 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
268 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 425 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
269 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 426 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
270 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 427 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
271 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 428 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
429 ;
272 430
273 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 431 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
274 432
275 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 433 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); 434 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
304 } 462 }
305 463
306 1 464 1
307 }; 465 };
308 466
467 push @add,
309 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 468 $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); 469 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 470 $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); 471 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, 472 $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); 473 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
474 ;
315 475
316 $x++ and ($x, $y) = (0, $y + 1); 476 $x++ and ($x, $y) = (0, $y + 1);
317 } 477 }
478
479 $sktbl->add_at (@add);
318 } 480 }
319 481
320 for (grep exists $stats->{$_}, @skills) { 482 for (grep exists $stats->{$_}, @skills) {
321 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 483 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
322 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 484 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
374 or return; 536 or return;
375 537
376 my ($hash, $x, $y, $w, $h) = @$map_info; 538 my ($hash, $x, $y, $w, $h) = @$map_info;
377 539
378 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 540 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
379 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 541 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
380 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 542 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
381} 543}
382 544
383sub map_clear { 545sub map_clear {
384 my ($self) = @_; 546 my ($self) = @_;
… …
388 550
389 $self->{map}->clear; 551 $self->{map}->clear;
390 delete $self->{map_widget}{magicmap}; 552 delete $self->{map_widget}{magicmap};
391} 553}
392 554
555sub bg_fetch {
556 my ($self) = @_;
557
558 my $id;
559
560 do {
561 $id = pop @{$self->{bg_fetch}}
562 or return;
563 } while $self->{texture}[$id];
564
565 CFPlus::DB::get tilecache => $id, sub {
566 my ($data) = @_;
567
568 return unless $self->{map}; # stop when destroyed
569
570 $self->set_texture ($id => $data)
571 if defined $data;
572
573 $self->bg_fetch;
574 };
575}
393 576
394sub load_map($$$) { 577sub load_map($$$) {
395 my ($self, $hash, $x, $y) = @_; 578 my ($self, $hash, $x, $y) = @_;
396 579
397 if (defined (my $data = $self->{mapcache}->get ($hash))) { 580 my $gen = $self->{map_change_gen};
581
582 CFPlus::DB::get $self->{mapcache} => $hash, sub {
583 return unless $gen == $self->{map_change_gen};
584
585 my ($data) = @_;
586
587 if (defined $data) {
398 $data = Compress::LZF::decompress $data; 588 $data = Compress::LZF::decompress $data;
399 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 589 #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 590
404 $self->set_texture ($id => $data); 591 my $inprogress = @{ $self->{bg_fetch} || [] };
592 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
593 $self->bg_fetch unless $inprogress;
405 } 594 }
406 } 595 };
407} 596}
408 597
409# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 598# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
410# (server resource,s latency, bandwidth), so this hack is warranted. 599# (server resource,s latency, bandwidth), so this hack is warranted.
411# the right fix is to make real tiled maps with an overview file 600# the right fix is to make real tiled maps with an overview file
… …
475 664
476 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 665 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
477 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 666 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
478 667
479 } else { 668 } else {
669 my $gen = $self->{map_change_gen};
480 $self->send_mapinfo ("spatial $path$tile", sub { 670 $self->send_mapinfo ("spatial $path$tile", sub {
671 return unless $gen == $self->{map_change_gen};
672
481 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 673 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
482 674
483 return if $mode ne "spatial"; 675 return if $mode ne "spatial";
484 676
485 $x += $self->{map}->ox; 677 $x += $self->{map}->ox;
… …
499 691
500sub map_change { 692sub map_change {
501 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 693 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
502 694
503 $self->flush_map; 695 $self->flush_map;
696
697 ++$self->{map_change_gen};
504 698
505 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 699 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
506 700
507 my $mapmapw = $self->{mapmap}->{w}; 701 my $mapmapw = $self->{mapmap}->{w};
508 my $mapmaph = $self->{mapmap}->{h}; 702 my $mapmaph = $self->{mapmap}->{h};
… …
525 $self->load_map ($hash, $x, $y); 719 $self->load_map ($hash, $x, $y);
526 $self->flood_fill (0, 0, 0, "", $hash, $flags); 720 $self->flood_fill (0, 0, 0, "", $hash, $flags);
527} 721}
528 722
529sub face_find { 723sub face_find {
530 my ($self, $facenum, $face) = @_; 724 my ($self, $facenum, $face, $cb) = @_;
531 725
532 my $hash = "$face->{chksum},$face->{name}"; 726 if ($face->{type} == 0) { # FT_FACE
727 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
533 728
534 my $id = $self->{facemap}->get ($hash); 729 $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# 730 $self->{faceid}[$facenum] = $id;
561 731
562 my $face = $self->{tilecache}->get ($id); 732 $self->{map}->set_tileid ($facenum => $id);
563 733
564 if ($face) { 734 CFPlus::DB::get tilecache => $id, $cb;
565 #$self->face_prefetch; 735
566 $face 736 } elsif ($face->{type} & 1) { # with metadata
567 } else { 737 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
568 my $tex = $self->{noface}; 738 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 }; 739 }
572} 740}
573 741
574sub face_update { 742sub face_update {
575 my ($self, $facenum, $face, $changed) = @_; 743 my ($self, $facenum, $face, $changed) = @_;
576 744
577 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 745 if ($face->{type} == 0) { # FT_FACE
746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
747 if $changed;
578 748
579 $self->set_texture ($face->{id} => delete $face->{image}); 749 $self->set_texture ($face->{id} => delete $face->{data});
750
751 } elsif ($face->{type} & 1) { # split metadata
752 my $cb = sub { };
753
754 if ($face->{type} == 3) { # FT_MUSIC
755 $cb = sub {
756 $self->{music_meta}{$facenum} = $face;
757
758 ::message ({ markup => "downloaded song #$facenum" })
759 if $changed;
760
761 &::audio_music_push ($facenum);
762 };
763 } elsif ($face->{type} == 5) { # FT_SOUND
764 $cb = sub {
765 $self->{sound_meta}{$facenum} = $face;
766
767 ::message ({ markup => "downloaded sound #$facenum" })
768 if $changed;
769
770 &::audio_sound_push ($facenum);
771 };
772 }
773
774 if ($changed) { # new data
775 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
776
777 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
778 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
779 $face->{meta} = $self->{json_coder}->decode ($meta_json);
780 ::add_license ($face);
781 $cb->();
782 };
783
784 } else {
785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
786 ::add_license ($face);
787 $cb->();
788 }
789 }
790}
791
792sub smooth_update {
793 my ($self, $facenum, $face) = @_;
794
795 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
580} 796}
581 797
582sub set_texture { 798sub set_texture {
583 my ($self, $id, $data) = @_; 799 my ($self, $id, $data) = @_;
584 800
801 return unless $self->{map};
802
585 $self->{texture}[$id] ||= do { 803 $self->{texture}[$id] = my $tex =
586 my $tex =
587 new_from_image CFPlus::Texture 804 new_from_image CFPlus::Texture
588 $data, minify => 1, mipmap => 1; 805 $data, minify => 1, mipmap => 1;
589 806
590 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 807 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
591 $self->{map_widget}->update; 808 $self->{map_widget}->update;
592 809
593 $tex 810 $_->() for @{(delete $self->{face_cb}{$id}) || []};
811}
812
813sub connect_face_update {
814 my ($self, $id, $cb) = @_;
815
816 push @{$self->{face_cb}{$id}}, $cb;
817
818 CFPlus::guard {
819 @{$self->{face_cb}{$id}}
820 = grep $_ != $cb,
821 @{$self->{face_cb}{$id}};
594 }; 822 }
595} 823}
596 824
597sub sound_play { 825sub sound_play {
598 my ($self, $x, $y, $soundnum, $type) = @_; 826 my ($self, $type, $face, $dx, $dy, $vol) = @_;
599 827
600 $self->{sound_play}->($x, $y, $soundnum, $type); 828 &::audio_sound_play ($face, $dx, $dy, $vol)
829 unless $type & 1; # odd types are silent for future expansion
601} 830}
602 831
603my $LAST_QUERY; # server is stupid, stupid, stupid 832my $LAST_QUERY; # server is stupid, stupid, stupid
604 833
605sub query { 834sub query {
… …
609 $LAST_QUERY = $prompt; 838 $LAST_QUERY = $prompt;
610 839
611 $self->{query}-> ($self, $flags, $prompt); 840 $self->{query}-> ($self, $flags, $prompt);
612} 841}
613 842
614sub drawinfo { 843sub sanitise_xml($) {
615 my ($self, $color, $text) = @_; 844 local $_ = shift;
616 845
617 my @color = ( 846 # we now weed out all tags we do not support
847 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
848 # now all entities
849 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
850
851 # handle some elements
852 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
853 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
854
855 $_
856}
857
858our %NAME_TO_COLOR = (
859 black => 0,
860 white => 1,
861 darkblue => 2,
862 red => 3,
863 orange => 4,
864 lightblue => 5,
865 darkorange => 6,
866 green => 7,
867 darkgreen => 8,
868 grey => 9,
869 brown => 10,
870 yellow => 11,
871 tan => 12,
872);
873
874our @CF_COLOR = (
618 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 875 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
619 [1.00, 1.00, 1.00], 876 [1.00, 1.00, 1.00],
620 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 877 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
621 [1.00, 0.00, 0.00], 878 [1.00, 0.00, 0.00],
622 [1.00, 0.54, 0.00], 879 [1.00, 0.54, 0.00],
623 [0.11, 0.56, 1.00], 880 [0.11, 0.56, 1.00],
624 [0.93, 0.46, 0.00], 881 [0.93, 0.46, 0.00],
625 [0.18, 0.54, 0.34], 882 [0.18, 0.54, 0.34],
626 [0.56, 0.73, 0.56], 883 [0.56, 0.73, 0.56],
627 [0.80, 0.80, 0.80], 884 [0.80, 0.80, 0.80],
628 [0.75, 0.61, 0.20], 885 [0.75, 0.61, 0.20],
629 [0.99, 0.77, 0.26], 886 [0.99, 0.77, 0.26],
630 [0.74, 0.65, 0.41], 887 [0.74, 0.65, 0.41],
631 ); 888);
632 889
633 my $fg = $color[$color % @color]; 890sub msg {
891 my ($self, $color, $type, $text, @extra) = @_;
634 892
893 $text = sanitise_xml $text;
894
895 if (my $cb = $self->{cb_msg}{$type}) {
896 $_->($self, $color, $type, $text, @extra) for values %$cb;
897 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
898 $type =~ s/-/_/g;
899 $self->{$type} = $text;
900 } else {
635 $self->logprint ("info: ", $text); 901 $self->logprint ("msg: ", $text);
902 return if $color < 0; # negative color == ignore if not understood
636 903
904 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
905
637 # try to create single paragraphs of multiple lines sent by the server 906 ## try to create single paragraphs of multiple lines sent by the server
907 # no longer neecssary with TRT servers
638 $text =~ s/(?<=\S)\n(?=\w)/ /g; 908 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
639 909
640 $text = CFPlus::asxml $text; 910 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
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 => $_ })
645 for split /\n/, $text; 911 for split /\n/, $text;
646 912
647 $self->{statusbox}->add ($text, 913 $self->{statusbox}->add ($text,
648 group => $text, 914 group => $text,
649 fg => $fg, 915 fg => $fg,
650 timeout => $color >= 2 ? 180 : 10, 916 timeout => $color >= 2 ? 180 : 10,
651 tooltip_font => $::FONT_FIXED, 917 tooltip_font => $::FONT_FIXED,
652 ); 918 );
653} 919 }
654
655sub drawextinfo {
656 my ($self, $color, $type, $subtype, $message) = @_;
657
658 $self->drawinfo ($color, $message);
659} 920}
660 921
661sub spell_add { 922sub spell_add {
662 my ($self, $spell) = @_; 923 my ($self, $spell) = @_;
663 924
… …
679} 940}
680 941
681sub setup { 942sub setup {
682 my ($self, $setup) = @_; 943 my ($self, $setup) = @_;
683 944
945 $self->{map_widget}->set_tilesize ($self->{tilesize});
684 $::MAP->resize ($self->{mapw}, $self->{maph}); 946 $::MAP->resize ($self->{mapw}, $self->{maph});
685} 947}
686 948
687sub addme_success { 949sub addme_success {
688 my ($self) = @_; 950 my ($self) = @_;
… …
710 $self->{map_widget}->clr_commands; 972 $self->{map_widget}->clr_commands;
711 973
712 ::stop_game (); 974 ::stop_game ();
713} 975}
714 976
715sub image_info {
716 my ($self, $numfaces) = @_;
717
718 $self->{num_faces} = $numfaces;
719 $self->{face_prefetch} = [1 .. $numfaces];
720 $self->face_prefetch;
721}
722
723sub face_prefetch {
724 my ($self) = @_;
725
726 return unless $::CFG->{face_prefetch};
727
728 if ($self->{num_faces}) {
729 return if @{ $self->{send_queue} || [] };
730 my $todo = @{ $self->{face_prefetch} }
731 or return;
732
733 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
734
735 $self->send ("requestinfo image_sums $face $face");
736
737 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
738 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
739 } elsif (!exists $self->{num_faces}) {
740 $self->send ("requestinfo image_info");
741
742 $self->{num_faces} = 0;
743
744 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
745 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
746 }
747}
748
749sub update_floorbox { 977sub update_floorbox {
750 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 978 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
751 return unless $::CONN; 979 return unless $::CONN;
752 980
753 $::FLOORBOX->clear; 981 $::FLOORBOX->clear;
982
983 my @add;
754 984
755 my $row; 985 my $row;
756 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 986 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
757 if ($row < 6) { 987 if ($row < 6) {
758 local $_->{face_widget}; # hack to force recreation of widget 988 local $_->{face_widget}; # hack to force recreation of widget
759 local $_->{desc_widget}; # hack to force recreation of widget 989 local $_->{desc_widget}; # hack to force recreation of widget
760 CFPlus::Item::update_widgets $_; 990 CFPlus::Item::update_widgets $_;
761 991
992 push @add,
762 $::FLOORBOX->add (0, $row, $_->{face_widget}); 993 0, $row, $_->{face_widget},
763 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 994 1, $row, $_->{desc_widget};
764 995
765 $row++; 996 $row++;
766 } else { 997 } else {
767 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 998 push @add, 1, $row, new CFPlus::UI::Button
768 text => "More...", 999 text => "More...",
769 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1000 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
770 ); 1001 ;
771 last; 1002 last;
772 } 1003 }
773 } 1004 }
774 if ($::CONN->{open_container}) { 1005 if ($::CONN->{open_container}) {
775 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1006 push @add, 1, $row++, new CFPlus::UI::Button
776 text => "Close container", 1007 text => "Close container",
777 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1008 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
778 ); 1009 ;
779 } 1010 }
1011
1012 $::FLOORBOX->add_at (@add);
780 }); 1013 });
781 1014
782 $::WANT_REFRESH++; 1015 $::WANT_REFRESH++;
783} 1016}
784 1017
… …
895 $::SERVER_INFO->set_markup ( 1128 $::SERVER_INFO->set_markup (
896 "server <tt>$self->{host}:$self->{port}</tt>\n" 1129 "server <tt>$self->{host}:$self->{port}</tt>\n"
897 . "protocol version <tt>$self->{version}</tt>\n" 1130 . "protocol version <tt>$self->{version}</tt>\n"
898 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1131 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
899 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1132 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1133 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
900 . "editing support $yesno[!!$self->{editor_support}]\n" 1134 . "editing support $yesno[!!$self->{editor_support}]\n"
901 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1135 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1136 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
902 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1137 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
903 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1138 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
904 . "map size $self->{mapw}×$self->{maph}\n" 1139 . "map size $self->{mapw}×$self->{maph}\n"
905 ); 1140 );
906 1141
907 ::setup_build_button ($self->{editor_support}->{builder_ui});
908} 1142}
909 1143
910sub logged_in { 1144sub logged_in {
911 my ($self) = @_; 1145 my ($self) = @_;
912 1146
913 $self->send_ext_req (cfplus_support => version => 1, sub { 1147 $self->send_ext_req (cfplus_support => version => 2, sub {
1148 my (%msg) = @_;
1149
914 $self->{cfplus_ext} = $_[0]{version}; 1150 $self->{cfplus_ext} = $msg{version};
915 $self->update_server_info; 1151 $self->update_server_info;
916 1152
917 if ($self->{cfplus_ext} >= 2) { 1153 if ($self->{cfplus_ext} >= 2) {
918 $self->send_ext_req ("editor_support", sub { 1154 $self->send_ext_req ("editor_support", sub {
919 $self->{editor_support} = $_[0]; 1155 $self->{editor_support} = { @_ };
920 $self->update_server_info; 1156 $self->update_server_info;
921 1157
922 0 1158 0
923 }); 1159 });
924 } 1160 }
… …
932 $self->send_command ("output-count $::CFG->{output_count}"); 1168 $self->send_command ("output-count $::CFG->{output_count}");
933 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1169 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
934 $self->send_command ("pickup $::CFG->{pickup}"); 1170 $self->send_command ("pickup $::CFG->{pickup}");
935} 1171}
936 1172
937sub buildat {
938 my ($self, $builditem, $x, $y) = @_;
939
940 if ($self->{cfplus_ext}) {
941 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
942 }
943}
944
945sub lookat { 1173sub lookat {
946 my ($self, $x, $y) = @_; 1174 my ($self, $x, $y) = @_;
947 1175
948 if ($self->{cfplus_ext}) { 1176 if ($self->{cfplus_ext}) {
949 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1177 $self->send_ext_req (lookat => $x, $y, sub {
950 my ($msg) = @_; 1178 my (%msg) = @_;
951 1179
952 if (exists $msg->{npc_dialog}) { 1180 if (exists $msg{npc_dialog}) {
953 # start npc chat dialog 1181 # start npc chat dialog
954 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1182 $self->{npc_dialog} = new CFPlus::NPCDialog::
955 dx => $x, 1183 token => $msg{npc_dialog},
956 dy => $y,
957 title => "$msg->{npc_dialog} (NPC)", 1184 title => "$msg{npc_dialog}[0] (NPC)",
958 conn => $self, 1185 conn => $self,
959 ; 1186 ;
960 } 1187 }
961 }); 1188 });
962 } 1189 }
… …
969 1196
970 (delete $self->{npc_dialog})->destroy 1197 (delete $self->{npc_dialog})->destroy
971 if $self->{npc_dialog}; 1198 if $self->{npc_dialog};
972 1199
973 $self->SUPER::destroy; 1200 $self->SUPER::destroy;
1201
1202 %$self = ();
974} 1203}
975 1204
976package CFPlus::NPCDialog; 1205package CFPlus::NPCDialog;
977 1206
978our @ISA = 'CFPlus::UI::Toplevel'; 1207our @ISA = 'CFPlus::UI::Toplevel';
… …
1025 on_activate => sub { $this->destroy; 1 }, 1254 on_activate => sub { $this->destroy; 1 },
1026 ; 1255 ;
1027 1256
1028 $self->update_options; 1257 $self->update_options;
1029 1258
1030 $self->{id} = $self->{conn}->send_ext_req ( 1259 $self->{id} = "npc-channel-" . $self->{conn}->token;
1031 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1260 $self->{conn}->connect_ext ($self->{id} => sub {
1032 sub { $this && $this->feed (@_) } 1261 $this->feed (@_) if $this;
1033 ); 1262 });
1263
1264 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1034 1265
1035 $self->{entry}->grab_focus; 1266 $self->{entry}->grab_focus;
1036 1267
1037 $self->{textview}->add_paragraph ({ 1268 $self->{textview}->add_paragraph ({
1038 fg => [1, 1, 0, 1], 1269 fg => [1, 1, 0, 1],
… …
1061 ); 1292 );
1062 } 1293 }
1063} 1294}
1064 1295
1065sub feed { 1296sub feed {
1066 my ($self, $msg) = @_; 1297 my ($self, $type, @arg) = @_;
1067 1298
1068 CFPlus::weaken $self; 1299 CFPlus::weaken $self;
1069 1300
1070 if ($msg->{msgtype} eq "reply") { 1301 if ($type eq "update") {
1302 my (%info) = @arg;
1303
1071 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1304 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1072 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1305 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1073
1074 my $text = "\n" . CFPlus::asxml $msg->{msg};
1075 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1076 my @link;
1077 $text =~ s{
1078 ($match)
1079 }{
1080 my $kw = $1;
1081
1082 push @link, new CFPlus::UI::Label
1083 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1084 can_hover => 1,
1085 can_events => 1,
1086 padding_x => 0,
1087 padding_y => 0,
1088 on_button_up => sub {
1089 $self->send ($kw);
1090 };
1091
1092 "\x{fffc}"
1093 }giex;
1094 1306
1307 if (exists $info{msg}) {
1308 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1309 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1310 my @link;
1311 $text =~ s{
1312 ($match)
1313 }{
1314 my $kw = $1;
1315
1316 push @link, new CFPlus::UI::Label
1317 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1318 can_hover => 1,
1319 can_events => 1,
1320 padding_x => 0,
1321 padding_y => 0,
1322 on_button_up => sub {
1323 $self->send ($kw);
1324 };
1325
1326 "\x{fffc}"
1327 }giex;
1328
1095 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1329 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1096 $self->{textview}->scroll_to_bottom; 1330 $self->{textview}->scroll_to_bottom;
1331 }
1332
1097 $self->update_options; 1333 $self->update_options;
1098 } else { 1334 } else {
1099 $self->destroy; 1335 $self->destroy;
1100 } 1336 }
1101 1337
… …
1106 my ($self, $msg) = @_; 1342 my ($self, $msg) = @_;
1107 1343
1108 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1344 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1109 $self->{textview}->scroll_to_bottom; 1345 $self->{textview}->scroll_to_bottom;
1110 1346
1111 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1347 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1112} 1348}
1113 1349
1114sub destroy { 1350sub destroy {
1115 my ($self) = @_; 1351 my ($self) = @_;
1116 1352
1117 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1353 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1118 1354
1119 if ($self->{conn}) { 1355 if ($self->{conn}) {
1120 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1356 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1121 delete $self->{conn}{npc_dialog}; 1357 delete $self->{conn}{npc_dialog};
1122 $self->{conn}->disconnect_ext ($self->{id}); 1358 $self->{conn}->disconnect_ext ($self->{id});
1123 } 1359 }
1124 1360
1125 $self->SUPER::destroy; 1361 $self->SUPER::destroy;

Diff Legend

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