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.81 by root, Sat Aug 19 02:49:55 2006 UTC vs.
Revision 1.131 by root, Tue Jul 24 04:54:48 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;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
11 16
12use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
13 18
14sub new { 19sub new {
15 my $class = shift; 20 my ($class, %arg) = @_;
16 21
17 my $self = $class->SUPER::new (@_, setup_req => { extmap => 0 }); 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 );
18 30
19 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
20 32
21 my @cmd_help = map { 33 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 45 for @args;
34 46
35 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
37 @args 49 @args
38 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
39 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
40 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_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 # destroy widgets on logout
191 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
192 for my $ws (values %{delete $self->{widgetset} || {}}) {
193 $_->destroy
194 for values %{delete $ws->{w} || {}};
195 }
196 });
197
41 $self->{map_widget}->add_command (@$_) 198 $self->{map_widget}->add_command (@$_)
42 for @cmd_help; 199 for @cmd_help;
43 200
201 {
202 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
203 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
204 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
205 }
206
207 {
44 $self->{noface} = new_from_file CFPlus::Texture 208 $self->{noface} = my $tex = new_from_file CFPlus::Texture
45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 209 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
210 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
211 }
46 212
47 $self->{open_container} = 0; 213 $self->{open_container} = 0;
48 214
49 # "global"
50 $self->{tilecache} = CFPlus::db_table "tilecache"
51 or die "tilecache: unable to open database table";
52 $self->{facemap} = CFPlus::db_table "facemap"
53 or die "facemap: unable to open database table";
54
55 # per server 215 # per server
56 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 216 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
57 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
58 217
59 $self 218 $self
60} 219}
61 220
62sub logprint { 221sub logprint {
… …
219 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 378 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
220 $::GAUGES->{food} ->set_value ($fo, $fo_m); 379 $::GAUGES->{food} ->set_value ($fo, $fo_m);
221 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 380 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
222 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 381 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
223 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 382 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
224 my $rng = $stats->{+CS_STAT_RANGE}; 383 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
225 $rng =~ s/^Range: //; # thank you so much dear server
226 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
227 my $title = $stats->{+CS_STAT_TITLE}; 384 my $title = $stats->{+CS_STAT_TITLE};
228 $title =~ s/^Player: //; 385 $title =~ s/^Player: //;
229 $::STATWIDS->{title} ->set_text ("Title: " . $title); 386 $::STATWIDS->{title} ->set_text ("Title: " . $title);
230 387
231 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 388 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
251 my @skills = keys %{ $self->{skill_info} }; 408 my @skills = keys %{ $self->{skill_info} };
252 409
253 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 410 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
254 $sktbl->clear; 411 $sktbl->clear;
255 412
413 my @add;
414
415 push @add,
256 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 416 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
257 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 417 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
258 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 418 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
259 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 419 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
260 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 420 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
261 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 421 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
422 ;
262 423
263 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 424 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
264 425
265 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 426 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
266 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 427 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
280 if ($ev->{button} == 1) { 441 if ($ev->{button} == 1) {
281 $::CONN->user_send ("ready_skill $name"); 442 $::CONN->user_send ("ready_skill $name");
282 } elsif ($ev->{button} == 2) { 443 } elsif ($ev->{button} == 2) {
283 $::CONN->user_send ("use_skill $name"); 444 $::CONN->user_send ("use_skill $name");
284 } elsif ($ev->{button} == 3) { 445 } elsif ($ev->{button} == 3) {
446 my $shortname = CFPlus::shorten $name, 14;
285 (new CFPlus::UI::Menu 447 (new CFPlus::UI::Menu
286 items => [ 448 items => [
287 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 449 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
288 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 450 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
289 ], 451 ],
290 )->popup ($ev); 452 )->popup ($ev);
291 } else { 453 } else {
292 return 0; 454 return 0;
293 } 455 }
294 456
295 1 457 1
296 }; 458 };
297 459
460 push @add,
298 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 461 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
299 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 462 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
300 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 463 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
301 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 464 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
302 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 465 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
303 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 466 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
467 ;
304 468
305 $x++ and ($x, $y) = (0, $y + 1); 469 $x++ and ($x, $y) = (0, $y + 1);
306 } 470 }
471
472 $sktbl->add_at (@add);
307 } 473 }
308 474
309 for (grep exists $stats->{$_}, @skills) { 475 for (grep exists $stats->{$_}, @skills) {
310 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 476 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
311 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 477 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
312 } 478 }
313} 479}
314 480
481sub macro_send {
482 my ($self, $macro) = @_;
483
484 for my $cmd (@{ $macro->{action} }) {
485 $self->send_command ($cmd);
486 }
487}
488
315sub user_send { 489sub user_send {
316 my ($self, $command) = @_; 490 my ($self, $command) = @_;
317 491
492 $self->{record}->($command)
318 if ($self->{record}) { 493 if $self->{record};
319 push @{$self->{record}}, $command;
320 }
321 494
322 $self->logprint ("send: ", $command); 495 $self->logprint ("send: ", $command);
323 $self->send_command ($command); 496 $self->send_command ($command);
324 ::status ($command); 497 ::status ($command);
325} 498}
326 499
327sub start_record { 500sub record {
328 my ($self) = @_; 501 my ($self, $cb) = @_;
329 502
330 $self->{record} = []; 503 $self->{record} = $cb;
331}
332
333sub stop_record {
334 my ($self) = @_;
335 return delete $self->{record};
336} 504}
337 505
338sub map_scroll { 506sub map_scroll {
339 my ($self, $dx, $dy) = @_; 507 my ($self, $dx, $dy) = @_;
340 508
… …
361 or return; 529 or return;
362 530
363 my ($hash, $x, $y, $w, $h) = @$map_info; 531 my ($hash, $x, $y, $w, $h) = @$map_info;
364 532
365 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 533 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
366 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 534 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
367 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 535 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
368} 536}
369 537
370sub map_clear { 538sub map_clear {
371 my ($self) = @_; 539 my ($self) = @_;
… …
375 543
376 $self->{map}->clear; 544 $self->{map}->clear;
377 delete $self->{map_widget}{magicmap}; 545 delete $self->{map_widget}{magicmap};
378} 546}
379 547
548sub bg_fetch {
549 my ($self) = @_;
550
551 my $id;
552
553 do {
554 $id = pop @{$self->{bg_fetch}}
555 or return;
556 } while $self->{texture}[$id];
557
558 CFPlus::DB::get tilecache => $id, sub {
559 my ($data) = @_;
560
561 return unless $self->{map}; # stop when destroyed
562
563 $self->set_texture ($id => $data)
564 if defined $data;
565
566 $self->bg_fetch;
567 };
568}
380 569
381sub load_map($$$) { 570sub load_map($$$) {
382 my ($self, $hash, $x, $y) = @_; 571 my ($self, $hash, $x, $y) = @_;
383 572
384 if (defined (my $data = $self->{mapcache}->get ($hash))) { 573 my $gen = $self->{map_change_gen};
574
575 CFPlus::DB::get $self->{mapcache} => $hash, sub {
576 return unless $gen == $self->{map_change_gen};
577
578 my ($data) = @_;
579
580 if (defined $data) {
385 $data = Compress::LZF::decompress $data; 581 $data = Compress::LZF::decompress $data;
386 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 582 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
387 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
388 my $data = $self->{tilecache}->get ($id)
389 or next;
390 583
391 $self->set_texture ($id => $data); 584 my $inprogress = @{ $self->{bg_fetch} || [] };
585 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
586 $self->bg_fetch unless $inprogress;
392 } 587 }
393 } 588 };
394} 589}
395 590
396# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 591# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
397# (server resource,s latency, bandwidth), so this hack is warranted. 592# (server resource,s latency, bandwidth), so this hack is warranted.
398# the right fix is to make real tiled maps with an overview file 593# the right fix is to make real tiled maps with an overview file
… …
462 657
463 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 658 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
464 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 659 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
465 660
466 } else { 661 } else {
662 my $gen = $self->{map_change_gen};
467 $self->send_mapinfo ("spatial $path$tile", sub { 663 $self->send_mapinfo ("spatial $path$tile", sub {
664 return unless $gen == $self->{map_change_gen};
665
468 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 666 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
469 667
470 return if $mode ne "spatial"; 668 return if $mode ne "spatial";
471 669
472 $x += $self->{map}->ox; 670 $x += $self->{map}->ox;
… …
486 684
487sub map_change { 685sub map_change {
488 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 686 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
489 687
490 $self->flush_map; 688 $self->flush_map;
689
690 ++$self->{map_change_gen};
491 691
492 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 692 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
493 693
494 my $mapmapw = $self->{mapmap}->{w}; 694 my $mapmapw = $self->{mapmap}->{w};
495 my $mapmaph = $self->{mapmap}->{h}; 695 my $mapmaph = $self->{mapmap}->{h};
… …
512 $self->load_map ($hash, $x, $y); 712 $self->load_map ($hash, $x, $y);
513 $self->flood_fill (0, 0, 0, "", $hash, $flags); 713 $self->flood_fill (0, 0, 0, "", $hash, $flags);
514} 714}
515 715
516sub face_find { 716sub face_find {
517 my ($self, $facenum, $face) = @_; 717 my ($self, $facenum, $face, $cb) = @_;
518 718
519 my $hash = "$face->{chksum},$face->{name}"; 719 if ($face->{type} == 0) { # FT_FACE
720 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
520 721
521 my $id = $self->{facemap}->get ($hash); 722 $face->{id} = $id;
522
523 unless ($id) {
524 # create new id for face
525 # I love transactions
526 for (1..100) {
527 my $txn = $CFPlus::DB_ENV->txn_begin;
528 my $status = $self->{facemap}->db_get (id => $id);
529 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
530 $id = ($id || 64) + 1;
531 if ($self->{facemap}->put (id => $id) == 0
532 && $self->{facemap}->put ($hash => $id) == 0) {
533 $txn->txn_commit;
534
535 goto gotid;
536 }
537 }
538 $txn->txn_abort;
539 }
540
541 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
542 }
543
544gotid:
545 $face->{id} = $id;
546 $self->{map}->set_face ($facenum => $id);
547 $self->{faceid}[$facenum] = $id;#d# 723 $self->{faceid}[$facenum] = $id;
548 724
549 my $face = $self->{tilecache}->get ($id); 725 $self->{map}->set_tileid ($facenum => $id);
550 726
551 if ($face) { 727 CFPlus::DB::get tilecache => $id, $cb;
552 #$self->face_prefetch; 728
553 $face 729 } elsif ($face->{type} & 1) { # with metadata
554 } else { 730 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
555 my $tex = $self->{noface}; 731 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
556 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
557 undef
558 }; 732 }
559} 733}
560 734
561sub face_update { 735sub face_update {
562 my ($self, $facenum, $face, $changed) = @_; 736 my ($self, $facenum, $face, $changed) = @_;
563 737
564 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 738 if ($face->{type} == 0) { # FT_FACE
739 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
740 if $changed;
565 741
566 $self->set_texture ($face->{id} => delete $face->{image}); 742 $self->set_texture ($face->{id} => delete $face->{data});
743
744 } elsif ($face->{type} & 1) { # split metadata
745 my $cb = sub { };
746
747 if ($face->{type} == 3) { # FT_MUSIC
748 $cb = sub {
749 $self->{music_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded song #$facenum" })
752 if $changed;
753
754 &::audio_music_set ($self->{songs});
755 };
756 }
757
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760 my $path = CFPlus::DB::path_of_res $face->{name};
761
762 CFPlus::DB::write_file $path, $data, sub {
763 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
764 $face->{meta} = $self->{json_coder}->decode ($meta_json);
765 $face->{path} = $path;
766
767 $cb->();
768 };
769 };
770 } else {
771 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
772 $cb->();
773 }
774 }
775}
776
777sub smooth_update {
778 my ($self, $facenum, $face) = @_;
779
780 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
567} 781}
568 782
569sub set_texture { 783sub set_texture {
570 my ($self, $id, $data) = @_; 784 my ($self, $id, $data) = @_;
571 785
786 return unless $self->{map};
787
572 $self->{texture}[$id] ||= do { 788 $self->{texture}[$id] = my $tex =
573 my $tex =
574 new_from_image CFPlus::Texture 789 new_from_image CFPlus::Texture
575 $data, minify => 1, mipmap => 1; 790 $data, minify => 1, mipmap => 1;
576 791
577 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 792 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
578 $self->{map_widget}->update; 793 $self->{map_widget}->update;
579 794
580 $tex 795 $_->() for @{(delete $self->{face_cb}{$id}) || []};
796}
797
798sub connect_face_update {
799 my ($self, $id, $cb) = @_;
800
801 push @{$self->{face_cb}{$id}}, $cb;
802
803 CFPlus::guard {
804 @{$self->{face_cb}{$id}}
805 = grep $_ != $cb,
806 @{$self->{face_cb}{$id}};
581 }; 807 }
582} 808}
583 809
584sub sound_play { 810sub sound_play {
585 my ($self, $x, $y, $soundnum, $type) = @_; 811 my ($self, $x, $y, $soundnum, $type) = @_;
586 812
… …
596 $LAST_QUERY = $prompt; 822 $LAST_QUERY = $prompt;
597 823
598 $self->{query}-> ($self, $flags, $prompt); 824 $self->{query}-> ($self, $flags, $prompt);
599} 825}
600 826
601sub drawinfo { 827sub sanitise_xml($) {
602 my ($self, $color, $text) = @_; 828 local $_ = shift;
603 829
604 my @color = ( 830 # we now weed out all tags we do not support
831 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
832 # now all entities
833 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
834
835 # handle some elements
836 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
837 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
838
839 $_
840}
841
842our %NAME_TO_COLOR = (
843 black => 0,
844 white => 1,
845 darkblue => 2,
846 red => 3,
847 orange => 4,
848 lightblue => 5,
849 darkorange => 6,
850 green => 7,
851 darkgreen => 8,
852 grey => 9,
853 brown => 10,
854 yellow => 11,
855 tan => 12,
856);
857
858our @CF_COLOR = (
605 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 859 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
606 [1.00, 1.00, 1.00], 860 [1.00, 1.00, 1.00],
607 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 861 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
608 [1.00, 0.00, 0.00], 862 [1.00, 0.00, 0.00],
609 [1.00, 0.54, 0.00], 863 [1.00, 0.54, 0.00],
610 [0.11, 0.56, 1.00], 864 [0.11, 0.56, 1.00],
611 [0.93, 0.46, 0.00], 865 [0.93, 0.46, 0.00],
612 [0.18, 0.54, 0.34], 866 [0.18, 0.54, 0.34],
613 [0.56, 0.73, 0.56], 867 [0.56, 0.73, 0.56],
614 [0.80, 0.80, 0.80], 868 [0.80, 0.80, 0.80],
615 [0.75, 0.61, 0.20], 869 [0.75, 0.61, 0.20],
616 [0.99, 0.77, 0.26], 870 [0.99, 0.77, 0.26],
617 [0.74, 0.65, 0.41], 871 [0.74, 0.65, 0.41],
618 ); 872);
619 873
874sub msg {
875 my ($self, $color, $type, $text, @extra) = @_;
876
877 $text = sanitise_xml $text;
878
879 if (my $cb = $self->{cb_msg}{$type}) {
880 $_->($self, $color, $type, $text, @extra) for values %$cb;
881 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
882 $type =~ s/-/_/g;
883 $self->{$type} = $text;
884 } else {
620 $self->logprint ("info: ", $text); 885 $self->logprint ("msg: ", $text);
886 return if $color < 0; # negative color == ignore if not understood
621 887
622 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 888 my $fg = $CF_COLOR[$color % @CF_COLOR];
623 889
624 # try to create single paragraphs of multiple lines sent by the server 890 ## try to create single paragraphs of multiple lines sent by the server
891 # no longer neecssary with TRT servers
625 $text =~ s/(?<=\S)\n(?=\w)/ /g; 892 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
626 893
627 $text = CFPlus::asxml $text; 894 ::message ({ fg => $fg, markup => $_ })
628 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 895 for split /\n/, $text;
629 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
630 896
631 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
632 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
633 $self->{logview}->scroll_to_bottom;
634
635 $self->{statusbox}->add ($text, 897 $self->{statusbox}->add ($text,
636 group => $text, 898 group => $text,
637 fg => $color[$color], 899 fg => $fg,
638 timeout => $color >= 2 ? 180 : 10, 900 timeout => $color >= 2 ? 180 : 10,
639 tooltip_font => $::FONT_FIXED, 901 tooltip_font => $::FONT_FIXED,
640 ); 902 );
641} 903 }
642
643sub drawextinfo {
644 my ($self, $color, $type, $subtype, $message) = @_;
645
646 $self->drawinfo ($color, $message);
647} 904}
648 905
649sub spell_add { 906sub spell_add {
650 my ($self, $spell) = @_; 907 my ($self, $spell) = @_;
651 908
652 # try to create single paragraphs out of the multiple lines sent by the server 909 # try to create single paragraphs out of the multiple lines sent by the server
653 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 910 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
654 $spell->{message} =~ s/\n+$//; 911 $spell->{message} =~ s/\n+$//;
655 $spell->{message} ||= "Server did not provide a description for this spell."; 912 $spell->{message} ||= "Server did not provide a description for this spell.";
656 913
657 $::SPELL_PAGE->add_spell ($spell); 914 $::SPELL_LIST->add_spell ($spell);
658 915
659 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 916 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
660 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 917 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
661} 918}
662 919
663sub spell_delete { 920sub spell_delete {
664 my ($self, $spell) = @_; 921 my ($self, $spell) = @_;
665 922
666 $::SPELL_PAGE->remove_spell ($spell); 923 $::SPELL_LIST->remove_spell ($spell);
924}
925
926sub setup {
927 my ($self, $setup) = @_;
928
929 $self->{map_widget}->set_tilesize ($self->{tilesize});
930 $::MAP->resize ($self->{mapw}, $self->{maph});
667} 931}
668 932
669sub addme_success { 933sub addme_success {
670 my ($self) = @_; 934 my ($self) = @_;
671 935
… …
732 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 996 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
733 return unless $::CONN; 997 return unless $::CONN;
734 998
735 $::FLOORBOX->clear; 999 $::FLOORBOX->clear;
736 1000
1001 my @add;
1002
737 my $row; 1003 my $row;
738 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1004 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
739 if ($row < 6) { 1005 if ($row < 6) {
740 local $_->{face_widget}; # hack to force recreation of widget 1006 local $_->{face_widget}; # hack to force recreation of widget
741 local $_->{desc_widget}; # hack to force recreation of widget 1007 local $_->{desc_widget}; # hack to force recreation of widget
742 CFPlus::Item::update_widgets $_; 1008 CFPlus::Item::update_widgets $_;
743 1009
1010 push @add,
744 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1011 0, $row, $_->{face_widget},
745 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1012 1, $row, $_->{desc_widget};
746 1013
747 $row++; 1014 $row++;
748 } else { 1015 } else {
749 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1016 push @add, 1, $row, new CFPlus::UI::Button
750 text => "More...", 1017 text => "More...",
751 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1018 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
752 ); 1019 ;
753 last; 1020 last;
754 } 1021 }
755 } 1022 }
756 if ($::CONN->{open_container}) { 1023 if ($::CONN->{open_container}) {
757 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1024 push @add, 1, $row++, new CFPlus::UI::Button
758 text => "Close container", 1025 text => "Close container",
759 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1026 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
760 ); 1027 ;
761 } 1028 }
1029
1030 $::FLOORBOX->add_at (@add);
762 }); 1031 });
763 1032
764 $::WANT_REFRESH++; 1033 $::WANT_REFRESH++;
765} 1034}
766 1035
… …
877 $::SERVER_INFO->set_markup ( 1146 $::SERVER_INFO->set_markup (
878 "server <tt>$self->{host}:$self->{port}</tt>\n" 1147 "server <tt>$self->{host}:$self->{port}</tt>\n"
879 . "protocol version <tt>$self->{version}</tt>\n" 1148 . "protocol version <tt>$self->{version}</tt>\n"
880 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1149 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
881 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1150 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1151 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1152 . "editing support $yesno[!!$self->{editor_support}]\n"
882 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1153 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1154 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
883 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1155 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
884 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1156 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
885 . "map size $self->{mapw}×$self->{maph}\n" 1157 . "map size $self->{mapw}×$self->{maph}\n"
886 ); 1158 );
1159
1160 ::setup_build_button ($self->{editor_support}->{builder_ui});
887} 1161}
888 1162
889sub logged_in { 1163sub logged_in {
890 my ($self) = @_; 1164 my ($self) = @_;
891 1165
892 $self->send_ext_req (cfplus_support => version => 1, sub { 1166 $self->send_ext_req (cfplus_support => version => 2, sub {
1167 my (%msg) = @_;
1168
893 $self->{cfplus_ext} = $_[0]{version}; 1169 $self->{cfplus_ext} = $msg{version};
894 $self->update_server_info; 1170 $self->update_server_info;
1171
1172 if ($self->{cfplus_ext} >= 2) {
1173 $self->send_ext_req ("editor_support", sub {
1174 $self->{editor_support} = { @_ };
1175 $self->update_server_info;
1176
1177 0
1178 });
1179 }
895 1180
896 0 1181 0
897 }); 1182 });
898 1183
899 $self->update_server_info; 1184 $self->update_server_info;
900 1185
901 $self->send_command ("output-sync $::CFG->{output_sync}"); 1186 $self->send_command ("output-sync $::CFG->{output_sync}");
902 $self->send_command ("output-count $::CFG->{output_count}"); 1187 $self->send_command ("output-count $::CFG->{output_count}");
1188 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
903 $self->send_command ("pickup $::CFG->{pickup}"); 1189 $self->send_command ("pickup $::CFG->{pickup}");
1190}
1191
1192sub buildat {
1193 my ($self, $builditem, $x, $y) = @_;
1194
1195 if ($self->{cfplus_ext}) {
1196 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1197 }
904} 1198}
905 1199
906sub lookat { 1200sub lookat {
907 my ($self, $x, $y) = @_; 1201 my ($self, $x, $y) = @_;
908 1202
909 if ($self->{cfplus_ext}) { 1203 if ($self->{cfplus_ext}) {
910 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1204 $self->send_ext_req (lookat => $x, $y, sub {
911 my ($msg) = @_; 1205 my (%msg) = @_;
912 1206
913 if (exists $msg->{npc_dialog}) { 1207 if (exists $msg{npc_dialog}) {
914 # start npc chat dialog 1208 # start npc chat dialog
915 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1209 $self->{npc_dialog} = new CFPlus::NPCDialog::
916 dx => $x, 1210 token => $msg{npc_dialog},
917 dy => $y,
918 title => "$msg->{npc_dialog} (NPC)", 1211 title => "$msg{npc_dialog}[0] (NPC)",
919 conn => $self, 1212 conn => $self,
920 ; 1213 ;
921 } 1214 }
922 }); 1215 });
923 } 1216 }
… …
930 1223
931 (delete $self->{npc_dialog})->destroy 1224 (delete $self->{npc_dialog})->destroy
932 if $self->{npc_dialog}; 1225 if $self->{npc_dialog};
933 1226
934 $self->SUPER::destroy; 1227 $self->SUPER::destroy;
1228
1229 %$self = ();
935} 1230}
936 1231
937package CFPlus::NPCDialog; 1232package CFPlus::NPCDialog;
938 1233
939our @ISA = 'CFPlus::UI::Toplevel'; 1234our @ISA = 'CFPlus::UI::Toplevel';
… …
951 kw => { hi => 0, yes => 0, no => 0 }, 1246 kw => { hi => 0, yes => 0, no => 0 },
952 has_close_button => 1, 1247 has_close_button => 1,
953 @_, 1248 @_,
954 ); 1249 );
955 1250
956 Scalar::Util::weaken (my $this = $self); 1251 CFPlus::weaken (my $this = $self);
957 1252
958 $self->connect (delete => sub { $this->destroy; 1 }); 1253 $self->connect (delete => sub { $this->destroy; 1 });
959 1254
960 # better use a pane... 1255 # better use a pane...
961 $self->add (my $hbox = new CFPlus::UI::HBox); 1256 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
986 on_activate => sub { $this->destroy; 1 }, 1281 on_activate => sub { $this->destroy; 1 },
987 ; 1282 ;
988 1283
989 $self->update_options; 1284 $self->update_options;
990 1285
991 $self->{id} = $self->{conn}->send_ext_req ( 1286 $self->{id} = "npc-channel-" . $self->{conn}->token;
992 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1287 $self->{conn}->connect_ext ($self->{id} => sub {
993 sub { $this && $this->feed (@_) } 1288 $this->feed (@_) if $this;
994 ); 1289 });
1290
1291 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
995 1292
996 $self->{entry}->grab_focus; 1293 $self->{entry}->grab_focus;
997 1294
998 $self->{textview}->add_paragraph ({ 1295 $self->{textview}->add_paragraph ({
999 fg => [1, 1, 0, 1], 1296 fg => [1, 1, 0, 1],
… …
1005}; 1302};
1006 1303
1007sub update_options { 1304sub update_options {
1008 my ($self) = @_; 1305 my ($self) = @_;
1009 1306
1010 Scalar::Util::weaken $self; 1307 CFPlus::weaken $self;
1011 1308
1012 $self->{options}->clear; 1309 $self->{options}->clear;
1013 $self->{options}->add ($self->{bye_button}); 1310 $self->{options}->add ($self->{bye_button});
1014 1311
1015 for my $kw (sort keys %{ $self->{kw} }) { 1312 for my $kw (sort keys %{ $self->{kw} }) {
… …
1022 ); 1319 );
1023 } 1320 }
1024} 1321}
1025 1322
1026sub feed { 1323sub feed {
1027 my ($self, $msg) = @_; 1324 my ($self, $type, @arg) = @_;
1028 1325
1029 Scalar::Util::weaken $self; 1326 CFPlus::weaken $self;
1030 1327
1031 if ($msg->{msgtype} eq "reply") { 1328 if ($type eq "update") {
1329 my (%info) = @arg;
1330
1032 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1331 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1033 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1332 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1034
1035 my $text = "\n" . CFPlus::asxml $msg->{msg};
1036 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1037 my @link;
1038 $text =~ s{
1039 ($match)
1040 }{
1041 my $kw = $1;
1042
1043 push @link, new CFPlus::UI::Label
1044 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1045 can_hover => 1,
1046 can_events => 1,
1047 padding_x => 0,
1048 padding_y => 0,
1049 on_button_up => sub {
1050 $self->send ($kw);
1051 };
1052
1053 "\x{fffc}"
1054 }giex;
1055 1333
1334 if (exists $info{msg}) {
1335 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1336 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1337 my @link;
1338 $text =~ s{
1339 ($match)
1340 }{
1341 my $kw = $1;
1342
1343 push @link, new CFPlus::UI::Label
1344 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1345 can_hover => 1,
1346 can_events => 1,
1347 padding_x => 0,
1348 padding_y => 0,
1349 on_button_up => sub {
1350 $self->send ($kw);
1351 };
1352
1353 "\x{fffc}"
1354 }giex;
1355
1056 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1356 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1057 $self->{textview}->scroll_to_bottom; 1357 $self->{textview}->scroll_to_bottom;
1358 }
1359
1058 $self->update_options; 1360 $self->update_options;
1059 } else { 1361 } else {
1060 $self->destroy; 1362 $self->destroy;
1061 } 1363 }
1062 1364
… …
1067 my ($self, $msg) = @_; 1369 my ($self, $msg) = @_;
1068 1370
1069 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1371 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1070 $self->{textview}->scroll_to_bottom; 1372 $self->{textview}->scroll_to_bottom;
1071 1373
1072 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1374 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1073} 1375}
1074 1376
1075sub destroy { 1377sub destroy {
1076 my ($self) = @_; 1378 my ($self) = @_;
1077 1379
1078 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1380 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1079 1381
1080 if ($self->{conn}) { 1382 if ($self->{conn}) {
1081 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1383 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1082 delete $self->{conn}{npc_dialog}; 1384 delete $self->{conn}{npc_dialog};
1083 $self->{conn}->disconnect_ext ($self->{id}); 1385 $self->{conn}->disconnect_ext ($self->{id});
1084 } 1386 }
1085 1387
1086 $self->SUPER::destroy; 1388 $self->SUPER::destroy;
1087} 1389}
1088 1390
10891 13911
1392

Diff Legend

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