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.139 by root, Sun Jul 29 18:22:34 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 (music => sub {
54 my ($ev) = @_;
55
56 &::audio_music_set ($self->{songs} = $ev->{play})
57 if $ev->{play};
58 });
59
60 $self->connect_ext (capabilities => sub {
61 my (%cap) = @_;
62
63 #$self->send ("setup sound 0"); # we use a different protocol
64
65 $self->send_exti_msg (fx_want => {
66 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
67 5 => !!$::CFG->{audio_enable}, # FT_SOUND
68 });
69
70 if (my $ts = $cap{tileset}) {
71 if (my ($default) = grep $_->[2] & 1, @$ts) {
72 $self->{tileset} = $default;
73 $self->{tilesize} = $default->[3];
74 $self->setup_req (tileset => $default->[0]);
75
76 my $w = int $self->{mapw} * 32 / $self->{tilesize};
77 my $h = int $self->{maph} * 32 / $self->{tilesize};
78
79 $self->setup_req (mapsize => "${w}x${h}");
80 }
81 }
82 });
83
84 $self->{json_coder}
85 ->convert_blessed
86 ->filter_json_single_key_object (__w_ => sub {
87 $self->{widget}{$_[0]}
88 });
89
90 # widgetset new
91 $self->connect_ext (ws_n => sub {
92 my ($id) = @_;
93
94 $self->{widgetset}{$id} = {
95 w => {},
96 };
97 });
98
99 # widgetset destroy
100 $self->connect_ext (ws_d => sub {
101 my ($id) = @_;
102
103 my $ws = delete $self->{widgetset}{$id}
104 or return;
105
106 $_->destroy
107 for values %{$ws->{w}};
108 });
109
110 # widgetset create
111 $self->connect_ext (ws_c => sub {
112 my ($ws, $id, $class, $args) = @_;
113
114 for my $ev (grep /^on_/, keys %$args) {
115 $args->{$ev} = sub {
116 my $id = shift->{s_id};
117 $self->send_exti_msg (w_e => $id, $ev, \@_);
118
119 1
120 };
121 }
122
123 if (my $widget = eval {
124 local $SIG{__DIE__};
125 "CFPlus::UI::$class"->new (
126 %$args,
127 s_ws => $ws,
128 s_id => $id,
129 )
130 }
131 ) {
132 $self->{widget}{$id}
133 = $self->{widgetset}{$ws}{w}{$id}
134 = $widget;
135
136 $widget->connect (on_destroy => sub {
137 my ($widget) = @_;
138
139 delete $self->{widget}{$widget->{s_id}};
140 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
141 });
142 } else {
143 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
144 $self->send_exti_msg (w_e => $id, "destroy");
145 }
146 });
147
148 # widget call
149 $self->connect_ext (w_c => sub {
150 my ($id, $rid, $method, $args) = @_;
151
152 my $w = $self->{widget}{$id}
153 or return;
154
155 $args ||= [];
156
157 if ($rid) {
158 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
159 } else {
160 $w->$method (@$args);
161 }
162 });
163
164 # widget set
165 $self->connect_ext (w_s => sub {
166 my ($id, $attr) = @_;
167
168 my $w = $self->{widget}{$id}
169 or return;
170
171 for (my $i = 0; $i < $#$attr; $i += 2) {
172 my ($member, $value) = @$attr[$i, $i+1];
173 if (defined $value) {
174 $w->{$member} = $value;
175 } else {
176 delete $w->{$member};
177 }
178 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
179 }
180 });
181
182 # widget get
183 $self->connect_ext (w_g => sub {
184 my ($id, $rid, $attr) = @_;
185
186 my $w = $self->{widget}{$id}
187 or return;
188
189 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
190 });
191
192 # message window
193 $self->connect_ext (channel_info => sub {
194 my ($info) = @_;
195 $self->{channels}->{$info->{id}} = $info;
196 $::MESSAGE_WINDOW->add_channel ($info);
197 });
198
199 # destroy widgets on logout
200 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
201 for my $ws (values %{delete $self->{widgetset} || {}}) {
202 $_->destroy
203 for values %{delete $ws->{w} || {}};
204 }
205 });
206
45 $self->{map_widget}->add_command (@$_) 207 $self->{map_widget}->add_command (@$_)
46 for @cmd_help; 208 for @cmd_help;
47
48 $self->{noface} = new_from_file CFPlus::Texture
49 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
50 209
51 { 210 {
52 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 211 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
53 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 212 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
54 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 213 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
55 } 214 }
56 215
216 {
217 $self->{noface} = my $tex = new_from_file CFPlus::Texture
218 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
219 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
220 }
221
57 $self->{open_container} = 0; 222 $self->{open_container} = 0;
58 223
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 224 # per server
66 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 225 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
67 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
68 226
69 $self 227 $self
70} 228}
71 229
72sub logprint { 230sub logprint {
… …
229 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 387 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
230 $::GAUGES->{food} ->set_value ($fo, $fo_m); 388 $::GAUGES->{food} ->set_value ($fo, $fo_m);
231 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 389 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
232 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 390 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
233 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 391 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
234 my $rng = $stats->{+CS_STAT_RANGE}; 392 $::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}; 393 my $title = $stats->{+CS_STAT_TITLE};
238 $title =~ s/^Player: //; 394 $title =~ s/^Player: //;
239 $::STATWIDS->{title} ->set_text ("Title: " . $title); 395 $::STATWIDS->{title} ->set_text ("Title: " . $title);
240 396
241 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 397 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
261 my @skills = keys %{ $self->{skill_info} }; 417 my @skills = keys %{ $self->{skill_info} };
262 418
263 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 419 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
264 $sktbl->clear; 420 $sktbl->clear;
265 421
422 my @add;
423
424 push @add,
266 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 425 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
267 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 426 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
268 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 427 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
269 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 428 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
270 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 429 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
271 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 430 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
431 ;
272 432
273 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 433 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
274 434
275 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 435 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); 436 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
304 } 464 }
305 465
306 1 466 1
307 }; 467 };
308 468
469 push @add,
309 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 470 $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); 471 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 472 $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); 473 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, 474 $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); 475 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
476 ;
315 477
316 $x++ and ($x, $y) = (0, $y + 1); 478 $x++ and ($x, $y) = (0, $y + 1);
317 } 479 }
480
481 $sktbl->add_at (@add);
318 } 482 }
319 483
320 for (grep exists $stats->{$_}, @skills) { 484 for (grep exists $stats->{$_}, @skills) {
321 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 485 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
322 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 486 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
374 or return; 538 or return;
375 539
376 my ($hash, $x, $y, $w, $h) = @$map_info; 540 my ($hash, $x, $y, $w, $h) = @$map_info;
377 541
378 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 542 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
379 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 543 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
380 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 544 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
381} 545}
382 546
383sub map_clear { 547sub map_clear {
384 my ($self) = @_; 548 my ($self) = @_;
… …
388 552
389 $self->{map}->clear; 553 $self->{map}->clear;
390 delete $self->{map_widget}{magicmap}; 554 delete $self->{map_widget}{magicmap};
391} 555}
392 556
557sub bg_fetch {
558 my ($self) = @_;
559
560 my $id;
561
562 do {
563 $id = pop @{$self->{bg_fetch}}
564 or return;
565 } while $self->{texture}[$id];
566
567 CFPlus::DB::get tilecache => $id, sub {
568 my ($data) = @_;
569
570 return unless $self->{map}; # stop when destroyed
571
572 $self->set_texture ($id => $data)
573 if defined $data;
574
575 $self->bg_fetch;
576 };
577}
393 578
394sub load_map($$$) { 579sub load_map($$$) {
395 my ($self, $hash, $x, $y) = @_; 580 my ($self, $hash, $x, $y) = @_;
396 581
397 if (defined (my $data = $self->{mapcache}->get ($hash))) { 582 my $gen = $self->{map_change_gen};
583
584 CFPlus::DB::get $self->{mapcache} => $hash, sub {
585 return unless $gen == $self->{map_change_gen};
586
587 my ($data) = @_;
588
589 if (defined $data) {
398 $data = Compress::LZF::decompress $data; 590 $data = Compress::LZF::decompress $data;
399 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 591 #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 592
404 $self->set_texture ($id => $data); 593 my $inprogress = @{ $self->{bg_fetch} || [] };
594 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
595 $self->bg_fetch unless $inprogress;
405 } 596 }
406 } 597 };
407} 598}
408 599
409# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 600# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
410# (server resource,s latency, bandwidth), so this hack is warranted. 601# (server resource,s latency, bandwidth), so this hack is warranted.
411# the right fix is to make real tiled maps with an overview file 602# the right fix is to make real tiled maps with an overview file
… …
475 666
476 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 667 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
477 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 668 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
478 669
479 } else { 670 } else {
671 my $gen = $self->{map_change_gen};
480 $self->send_mapinfo ("spatial $path$tile", sub { 672 $self->send_mapinfo ("spatial $path$tile", sub {
673 return unless $gen == $self->{map_change_gen};
674
481 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 675 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
482 676
483 return if $mode ne "spatial"; 677 return if $mode ne "spatial";
484 678
485 $x += $self->{map}->ox; 679 $x += $self->{map}->ox;
… …
499 693
500sub map_change { 694sub map_change {
501 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 695 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
502 696
503 $self->flush_map; 697 $self->flush_map;
698
699 ++$self->{map_change_gen};
504 700
505 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 701 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
506 702
507 my $mapmapw = $self->{mapmap}->{w}; 703 my $mapmapw = $self->{mapmap}->{w};
508 my $mapmaph = $self->{mapmap}->{h}; 704 my $mapmaph = $self->{mapmap}->{h};
… …
525 $self->load_map ($hash, $x, $y); 721 $self->load_map ($hash, $x, $y);
526 $self->flood_fill (0, 0, 0, "", $hash, $flags); 722 $self->flood_fill (0, 0, 0, "", $hash, $flags);
527} 723}
528 724
529sub face_find { 725sub face_find {
530 my ($self, $facenum, $face) = @_; 726 my ($self, $facenum, $face, $cb) = @_;
531 727
532 my $hash = "$face->{chksum},$face->{name}"; 728 if ($face->{type} == 0) { # FT_FACE
729 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
533 730
534 my $id = $self->{facemap}->get ($hash); 731 $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# 732 $self->{faceid}[$facenum] = $id;
561 733
562 my $face = $self->{tilecache}->get ($id); 734 $self->{map}->set_tileid ($facenum => $id);
563 735
564 if ($face) { 736 CFPlus::DB::get tilecache => $id, $cb;
565 #$self->face_prefetch; 737
566 $face 738 } elsif ($face->{type} & 1) { # with metadata
567 } else { 739 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
568 my $tex = $self->{noface}; 740 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
569 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
570 undef
571 }; 741 }
572} 742}
573 743
574sub face_update { 744sub face_update {
575 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
576 746
577 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 747 if ($face->{type} == 0) { # FT_FACE
748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
749 if $changed;
578 750
579 $self->set_texture ($face->{id} => delete $face->{image}); 751 $self->set_texture ($face->{id} => delete $face->{data});
752
753 } elsif ($face->{type} & 1) { # split metadata
754 my $cb = sub { };
755 my $path;
756
757 if ($face->{type} == 3) { # FT_MUSIC
758 # store externally
759 $path = CFPlus::DB::path_of_res $face->{name};
760
761 $cb = sub {
762 $self->{music_meta}{$facenum} = $face;
763
764 ::message ({ markup => "downloaded song #$facenum" })
765 if $changed;
766
767 &::audio_music_set ($self->{songs});
768 };
769 } elsif ($face->{type} == 5) { # FT_SOUND
770 $cb = sub {
771 $self->{sound_meta}{$facenum} = $face;
772
773 use Data::Dumper; warn Dumper $face;#d#
774 ::message ({ markup => "downloaded sound #$facenum" })
775 if $changed;
776 };
777 }
778
779
780 if ($changed) { # new data
781 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
782
783 my $put_cb = sub {
784 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
785 $face->{meta} = $self->{json_coder}->decode ($meta_json);
786 $face->{path} = $path;
787
788 $cb->();
789 };
790 };
791
792 if (defined $path) {
793 CFPlus::DB::write_file $path, $data, $put_cb;
794 } else {
795 CFPlus::DB::put "res-data" => $face->{name} => $data, $put_cb;
796 }
797 } else {
798 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
799 $face->{path} = $path;
800 $cb->();
801 }
802 }
803}
804
805sub smooth_update {
806 my ($self, $facenum, $face) = @_;
807
808 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
580} 809}
581 810
582sub set_texture { 811sub set_texture {
583 my ($self, $id, $data) = @_; 812 my ($self, $id, $data) = @_;
584 813
814 return unless $self->{map};
815
585 $self->{texture}[$id] ||= do { 816 $self->{texture}[$id] = my $tex =
586 my $tex =
587 new_from_image CFPlus::Texture 817 new_from_image CFPlus::Texture
588 $data, minify => 1, mipmap => 1; 818 $data, minify => 1, mipmap => 1;
589 819
590 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 820 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
591 $self->{map_widget}->update; 821 $self->{map_widget}->update;
592 822
593 $tex 823 $_->() for @{(delete $self->{face_cb}{$id}) || []};
824}
825
826sub connect_face_update {
827 my ($self, $id, $cb) = @_;
828
829 push @{$self->{face_cb}{$id}}, $cb;
830
831 CFPlus::guard {
832 @{$self->{face_cb}{$id}}
833 = grep $_ != $cb,
834 @{$self->{face_cb}{$id}};
594 }; 835 }
595} 836}
596 837
597sub sound_play { 838sub sound_play {
598 my ($self, $x, $y, $soundnum, $type) = @_; 839 my ($self, $x, $y, $soundnum, $type) = @_;
840 warn "sound play <@_>\n";#d#
599 841
600 $self->{sound_play}->($x, $y, $soundnum, $type); 842 #$self->{sound_play}->($x, $y, $soundnum, $type);
601} 843}
602 844
603my $LAST_QUERY; # server is stupid, stupid, stupid 845my $LAST_QUERY; # server is stupid, stupid, stupid
604 846
605sub query { 847sub query {
… …
609 $LAST_QUERY = $prompt; 851 $LAST_QUERY = $prompt;
610 852
611 $self->{query}-> ($self, $flags, $prompt); 853 $self->{query}-> ($self, $flags, $prompt);
612} 854}
613 855
614sub drawinfo { 856sub sanitise_xml($) {
615 my ($self, $color, $text) = @_; 857 local $_ = shift;
616 858
617 my @color = ( 859 # we now weed out all tags we do not support
860 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
861 # now all entities
862 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
863
864 # handle some elements
865 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
866 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
867
868 $_
869}
870
871our %NAME_TO_COLOR = (
872 black => 0,
873 white => 1,
874 darkblue => 2,
875 red => 3,
876 orange => 4,
877 lightblue => 5,
878 darkorange => 6,
879 green => 7,
880 darkgreen => 8,
881 grey => 9,
882 brown => 10,
883 yellow => 11,
884 tan => 12,
885);
886
887our @CF_COLOR = (
618 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 888 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
619 [1.00, 1.00, 1.00], 889 [1.00, 1.00, 1.00],
620 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 890 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
621 [1.00, 0.00, 0.00], 891 [1.00, 0.00, 0.00],
622 [1.00, 0.54, 0.00], 892 [1.00, 0.54, 0.00],
623 [0.11, 0.56, 1.00], 893 [0.11, 0.56, 1.00],
624 [0.93, 0.46, 0.00], 894 [0.93, 0.46, 0.00],
625 [0.18, 0.54, 0.34], 895 [0.18, 0.54, 0.34],
626 [0.56, 0.73, 0.56], 896 [0.56, 0.73, 0.56],
627 [0.80, 0.80, 0.80], 897 [0.80, 0.80, 0.80],
628 [0.75, 0.61, 0.20], 898 [0.75, 0.61, 0.20],
629 [0.99, 0.77, 0.26], 899 [0.99, 0.77, 0.26],
630 [0.74, 0.65, 0.41], 900 [0.74, 0.65, 0.41],
631 ); 901);
632 902
633 my $fg = $color[$color % @color]; 903sub msg {
904 my ($self, $color, $type, $text, @extra) = @_;
634 905
906 $text = sanitise_xml $text;
907
908 if (my $cb = $self->{cb_msg}{$type}) {
909 $_->($self, $color, $type, $text, @extra) for values %$cb;
910 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
911 $type =~ s/-/_/g;
912 $self->{$type} = $text;
913 } else {
635 $self->logprint ("info: ", $text); 914 $self->logprint ("msg: ", $text);
915 return if $color < 0; # negative color == ignore if not understood
636 916
917 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
918
637 # try to create single paragraphs of multiple lines sent by the server 919 ## try to create single paragraphs of multiple lines sent by the server
920 # no longer neecssary with TRT servers
638 $text =~ s/(?<=\S)\n(?=\w)/ /g; 921 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
639 922
640 $text = CFPlus::asxml $text; 923 ::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; 924 for split /\n/, $text;
646 925
647 $self->{statusbox}->add ($text, 926 $self->{statusbox}->add ($text,
648 group => $text, 927 group => $text,
649 fg => $fg, 928 fg => $fg,
650 timeout => $color >= 2 ? 180 : 10, 929 timeout => $color >= 2 ? 180 : 10,
651 tooltip_font => $::FONT_FIXED, 930 tooltip_font => $::FONT_FIXED,
652 ); 931 );
653} 932 }
654
655sub drawextinfo {
656 my ($self, $color, $type, $subtype, $message) = @_;
657
658 $self->drawinfo ($color, $message);
659} 933}
660 934
661sub spell_add { 935sub spell_add {
662 my ($self, $spell) = @_; 936 my ($self, $spell) = @_;
663 937
… …
679} 953}
680 954
681sub setup { 955sub setup {
682 my ($self, $setup) = @_; 956 my ($self, $setup) = @_;
683 957
958 $self->{map_widget}->set_tilesize ($self->{tilesize});
684 $::MAP->resize ($self->{mapw}, $self->{maph}); 959 $::MAP->resize ($self->{mapw}, $self->{maph});
685} 960}
686 961
687sub addme_success { 962sub addme_success {
688 my ($self) = @_; 963 my ($self) = @_;
… …
710 $self->{map_widget}->clr_commands; 985 $self->{map_widget}->clr_commands;
711 986
712 ::stop_game (); 987 ::stop_game ();
713} 988}
714 989
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 { 990sub update_floorbox {
750 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 991 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
751 return unless $::CONN; 992 return unless $::CONN;
752 993
753 $::FLOORBOX->clear; 994 $::FLOORBOX->clear;
995
996 my @add;
754 997
755 my $row; 998 my $row;
756 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 999 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
757 if ($row < 6) { 1000 if ($row < 6) {
758 local $_->{face_widget}; # hack to force recreation of widget 1001 local $_->{face_widget}; # hack to force recreation of widget
759 local $_->{desc_widget}; # hack to force recreation of widget 1002 local $_->{desc_widget}; # hack to force recreation of widget
760 CFPlus::Item::update_widgets $_; 1003 CFPlus::Item::update_widgets $_;
761 1004
1005 push @add,
762 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1006 0, $row, $_->{face_widget},
763 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1007 1, $row, $_->{desc_widget};
764 1008
765 $row++; 1009 $row++;
766 } else { 1010 } else {
767 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1011 push @add, 1, $row, new CFPlus::UI::Button
768 text => "More...", 1012 text => "More...",
769 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1013 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
770 ); 1014 ;
771 last; 1015 last;
772 } 1016 }
773 } 1017 }
774 if ($::CONN->{open_container}) { 1018 if ($::CONN->{open_container}) {
775 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1019 push @add, 1, $row++, new CFPlus::UI::Button
776 text => "Close container", 1020 text => "Close container",
777 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1021 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
778 ); 1022 ;
779 } 1023 }
1024
1025 $::FLOORBOX->add_at (@add);
780 }); 1026 });
781 1027
782 $::WANT_REFRESH++; 1028 $::WANT_REFRESH++;
783} 1029}
784 1030
… …
895 $::SERVER_INFO->set_markup ( 1141 $::SERVER_INFO->set_markup (
896 "server <tt>$self->{host}:$self->{port}</tt>\n" 1142 "server <tt>$self->{host}:$self->{port}</tt>\n"
897 . "protocol version <tt>$self->{version}</tt>\n" 1143 . "protocol version <tt>$self->{version}</tt>\n"
898 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1144 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
899 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1145 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1146 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
900 . "editing support $yesno[!!$self->{editor_support}]\n" 1147 . "editing support $yesno[!!$self->{editor_support}]\n"
901 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1148 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1149 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
902 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1150 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
903 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1151 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
904 . "map size $self->{mapw}×$self->{maph}\n" 1152 . "map size $self->{mapw}×$self->{maph}\n"
905 ); 1153 );
906 1154
907 ::setup_build_button ($self->{editor_support}->{builder_ui});
908} 1155}
909 1156
910sub logged_in { 1157sub logged_in {
911 my ($self) = @_; 1158 my ($self) = @_;
912 1159
913 $self->send_ext_req (cfplus_support => version => 1, sub { 1160 $self->send_ext_req (cfplus_support => version => 2, sub {
1161 my (%msg) = @_;
1162
914 $self->{cfplus_ext} = $_[0]{version}; 1163 $self->{cfplus_ext} = $msg{version};
915 $self->update_server_info; 1164 $self->update_server_info;
916 1165
917 if ($self->{cfplus_ext} >= 2) { 1166 if ($self->{cfplus_ext} >= 2) {
918 $self->send_ext_req ("editor_support", sub { 1167 $self->send_ext_req ("editor_support", sub {
919 $self->{editor_support} = $_[0]; 1168 $self->{editor_support} = { @_ };
920 $self->update_server_info; 1169 $self->update_server_info;
921 1170
922 0 1171 0
923 }); 1172 });
924 } 1173 }
… …
932 $self->send_command ("output-count $::CFG->{output_count}"); 1181 $self->send_command ("output-count $::CFG->{output_count}");
933 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1182 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
934 $self->send_command ("pickup $::CFG->{pickup}"); 1183 $self->send_command ("pickup $::CFG->{pickup}");
935} 1184}
936 1185
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 { 1186sub lookat {
946 my ($self, $x, $y) = @_; 1187 my ($self, $x, $y) = @_;
947 1188
948 if ($self->{cfplus_ext}) { 1189 if ($self->{cfplus_ext}) {
949 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1190 $self->send_ext_req (lookat => $x, $y, sub {
950 my ($msg) = @_; 1191 my (%msg) = @_;
951 1192
952 if (exists $msg->{npc_dialog}) { 1193 if (exists $msg{npc_dialog}) {
953 # start npc chat dialog 1194 # start npc chat dialog
954 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1195 $self->{npc_dialog} = new CFPlus::NPCDialog::
955 dx => $x, 1196 token => $msg{npc_dialog},
956 dy => $y,
957 title => "$msg->{npc_dialog} (NPC)", 1197 title => "$msg{npc_dialog}[0] (NPC)",
958 conn => $self, 1198 conn => $self,
959 ; 1199 ;
960 } 1200 }
961 }); 1201 });
962 } 1202 }
… …
969 1209
970 (delete $self->{npc_dialog})->destroy 1210 (delete $self->{npc_dialog})->destroy
971 if $self->{npc_dialog}; 1211 if $self->{npc_dialog};
972 1212
973 $self->SUPER::destroy; 1213 $self->SUPER::destroy;
1214
1215 %$self = ();
974} 1216}
975 1217
976package CFPlus::NPCDialog; 1218package CFPlus::NPCDialog;
977 1219
978our @ISA = 'CFPlus::UI::Toplevel'; 1220our @ISA = 'CFPlus::UI::Toplevel';
… …
1025 on_activate => sub { $this->destroy; 1 }, 1267 on_activate => sub { $this->destroy; 1 },
1026 ; 1268 ;
1027 1269
1028 $self->update_options; 1270 $self->update_options;
1029 1271
1030 $self->{id} = $self->{conn}->send_ext_req ( 1272 $self->{id} = "npc-channel-" . $self->{conn}->token;
1031 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1273 $self->{conn}->connect_ext ($self->{id} => sub {
1032 sub { $this && $this->feed (@_) } 1274 $this->feed (@_) if $this;
1033 ); 1275 });
1276
1277 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1034 1278
1035 $self->{entry}->grab_focus; 1279 $self->{entry}->grab_focus;
1036 1280
1037 $self->{textview}->add_paragraph ({ 1281 $self->{textview}->add_paragraph ({
1038 fg => [1, 1, 0, 1], 1282 fg => [1, 1, 0, 1],
… …
1061 ); 1305 );
1062 } 1306 }
1063} 1307}
1064 1308
1065sub feed { 1309sub feed {
1066 my ($self, $msg) = @_; 1310 my ($self, $type, @arg) = @_;
1067 1311
1068 CFPlus::weaken $self; 1312 CFPlus::weaken $self;
1069 1313
1070 if ($msg->{msgtype} eq "reply") { 1314 if ($type eq "update") {
1315 my (%info) = @arg;
1316
1071 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1317 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1072 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1318 $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 1319
1320 if (exists $info{msg}) {
1321 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1322 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1323 my @link;
1324 $text =~ s{
1325 ($match)
1326 }{
1327 my $kw = $1;
1328
1329 push @link, new CFPlus::UI::Label
1330 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1331 can_hover => 1,
1332 can_events => 1,
1333 padding_x => 0,
1334 padding_y => 0,
1335 on_button_up => sub {
1336 $self->send ($kw);
1337 };
1338
1339 "\x{fffc}"
1340 }giex;
1341
1095 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1342 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1096 $self->{textview}->scroll_to_bottom; 1343 $self->{textview}->scroll_to_bottom;
1344 }
1345
1097 $self->update_options; 1346 $self->update_options;
1098 } else { 1347 } else {
1099 $self->destroy; 1348 $self->destroy;
1100 } 1349 }
1101 1350
… …
1106 my ($self, $msg) = @_; 1355 my ($self, $msg) = @_;
1107 1356
1108 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1357 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1109 $self->{textview}->scroll_to_bottom; 1358 $self->{textview}->scroll_to_bottom;
1110 1359
1111 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1360 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1112} 1361}
1113 1362
1114sub destroy { 1363sub destroy {
1115 my ($self) = @_; 1364 my ($self) = @_;
1116 1365
1117 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1366 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1118 1367
1119 if ($self->{conn}) { 1368 if ($self->{conn}) {
1120 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1369 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1121 delete $self->{conn}{npc_dialog}; 1370 delete $self->{conn}{npc_dialog};
1122 $self->{conn}->disconnect_ext ($self->{id}); 1371 $self->{conn}->disconnect_ext ($self->{id});
1123 } 1372 }
1124 1373
1125 $self->SUPER::destroy; 1374 $self->SUPER::destroy;

Diff Legend

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