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.72 by root, Sun Aug 13 02:43:22 2006 UTC vs.
Revision 1.117 by root, Fri Jul 13 05:31:31 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 (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,
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
50 } sort { $a->{par} <=> $b->{par} }
38 } CFPlus::Pod::find command_help => "*"; 51 CFPlus::Pod::find command => "*";
39 52
53 $self->connect_ext (event_music => sub {
54 my ($ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev->{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev->{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta) = @_;
73
74 if (defined $meta) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
76 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1];
81
82 CFPlus::DB::write_file $chksum, $data, sub { };
83 CFPlus::DB::put "res-metadata" => $chksum => $meta, sub { };
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
86 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs});
89 });
90 }
91 }
92 }
93 }
94
95 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 }
98 });
99
100 $self->connect_ext (event_capabilities => sub {
101 my ($cap) = @_;
102
103 if (my $ts = $cap->{tileset}) {
104 if (my ($default) = grep $_->[2] & 1, @$ts) {
105 $self->{tileset} = $default;
106 $self->{tilesize} = $default->[3];
107 $self->setup_req (tileset => $default->[0]);
108
109 my $w = int $self->{mapw} * 32 / $self->{tilesize};
110 my $h = int $self->{maph} * 32 / $self->{tilesize};
111
112 $self->setup_req (mapsize => "${w}x${h}");
113 }
114 }
115 });
116
117 $self->{json_coder}
118 ->convert_blessed
119 ->filter_json_single_key_object (__widget_ref__ => sub {
120 $self->{widget}{$_[0]}
121 });
122
123 $self->connect_ext (ws_n => sub {
124 my ($arg) = @_;
125
126 $self->{widgetset}{$arg{id}} = {
127 w => {},
128 };
129 });
130
131 $self->connect_ext (ws_d => sub {
132 my ($arg) = @_;
133
134 my $ws = delete $self->{widgetset}{$arg{id}}
135 or return;
136
137 $_->destroy
138 for values %{$ws->{w}};
139 });
140
141 $self->connect_ext (ws_c => sub {
142 my ($arg) = @_;
143
144 my $args = $arg->{args} || {};
145
146 for my $ev (grep /^on_/, keys %$args) {
147 $args->{$ev} = sub {
148 my $id = shift->{s_id};
149 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
150
151 1
152 };
153 }
154
155 if (my $widget = eval {
156 local $SIG{__DIE__};
157 "CFPlus::UI::$arg->{class}"->new (
158 %$args,
159 s_ws => $arg->{ws},
160 s_id => $arg->{id},
161 )
162 }
163 ) {
164 $self->{widget}{$arg->{id}}
165 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
166 = $widget;
167
168 $widget->connect (on_destroy => sub {
169 my ($widget) = @_;
170
171 delete $self->{widget}{$widget->{s_id}};
172 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
173 });
174 } else {
175 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
176 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
177 }
178 });
179
180 $self->connect_ext (w_c => sub {
181 my ($arg) = @_;
182
183 my $w = $self->{widget}{$arg->{id}}
184 or return;
185 my $m = $arg->{name};
186
187 my $a = $arg->{args} || [];
188
189 if (exists $arg->{rid}) {
190 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
191 } else {
192 $w->$m (@$a);
193 }
194 });
195
196 $self->connect_ext (w_s => sub {
197 my ($arg) = @_;
198
199 my $w = $self->{widget}{$arg->{id}}
200 or return;
201
202 $w->{$arg->{name}} = $arg->{value};
203 });
204
205 $self->connect_ext (w_g => sub {
206 my ($arg) = @_;
207
208 my $w = $self->{widget}{$arg->{id}}
209 or return;
210
211 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
212 });
213
214 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
215 for my $ws (values %{delete $self->{widgetset} || {}}) {
216 $_->destroy
217 for values %{delete $ws->{w} || {}};
218 }
219 });
220
40 $self->{map_widget}->add_command (@$_) 221 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 222 for @cmd_help;
42 223
224 {
225 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
226 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
227 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
228 }
229
230 {
43 $self->{noface} = new_from_file CFPlus::Texture 231 $self->{noface} = my $tex = new_from_file CFPlus::Texture
44 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 232 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
233 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
234 }
45 235
46 $self->{open_container} = 0; 236 $self->{open_container} = 0;
47 237
48 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache";
50 $self->{facemap} = CFPlus::db_table "facemap";
51
52 # per server 238 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 239 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
54 240
55 $self 241 $self
56} 242}
57 243
58sub logprint { 244sub logprint {
… …
215 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 401 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
216 $::GAUGES->{food} ->set_value ($fo, $fo_m); 402 $::GAUGES->{food} ->set_value ($fo, $fo_m);
217 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 403 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
218 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 404 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
219 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 405 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
220 my $rng = $stats->{+CS_STAT_RANGE}; 406 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
221 $rng =~ s/^Range: //; # thank you so much dear server
222 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
223 my $title = $stats->{+CS_STAT_TITLE}; 407 my $title = $stats->{+CS_STAT_TITLE};
224 $title =~ s/^Player: //; 408 $title =~ s/^Player: //;
225 $::STATWIDS->{title} ->set_text ("Title: " . $title); 409 $::STATWIDS->{title} ->set_text ("Title: " . $title);
226 410
227 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 411 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
258 442
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 443 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260 444
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 445 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
262 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 446 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
263 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264 447
265 my ($x, $y) = (0, 1); 448 my ($x, $y) = (0, 1);
266 for ( 449 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 450 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 451 map [$_, $self->{skill_info}{$_}],
… …
277 if ($ev->{button} == 1) { 460 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 461 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 462 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 463 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 464 } elsif ($ev->{button} == 3) {
465 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 466 (new CFPlus::UI::Menu
283 items => [ 467 items => [
284 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 468 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
285 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 469 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
286 ], 470 ],
287 )->popup ($ev); 471 )->popup ($ev);
288 } else { 472 } else {
289 return 0; 473 return 0;
290 } 474 }
… …
294 478
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 479 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
296 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 480 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
297 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 481 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
298 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 482 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
299 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 483 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
484 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
300 485
301 $x++ and ($x, $y) = (0, $y + 1); 486 $x++ and ($x, $y) = (0, $y + 1);
302 } 487 }
303 } 488 }
304 489
… …
306 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 491 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
307 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 492 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
308 } 493 }
309} 494}
310 495
496sub macro_send {
497 my ($self, $macro) = @_;
498
499 for my $cmd (@{ $macro->{action} }) {
500 $self->send_command ($cmd);
501 }
502}
503
311sub user_send { 504sub user_send {
312 my ($self, $command) = @_; 505 my ($self, $command) = @_;
313 506
507 $self->{record}->($command)
314 if ($self->{record}) { 508 if $self->{record};
315 push @{$self->{record}}, $command;
316 }
317 509
318 $self->logprint ("send: ", $command); 510 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 511 $self->send_command ($command);
320 ::status ($command); 512 ::status ($command);
321} 513}
322 514
323sub start_record { 515sub record {
324 my ($self) = @_; 516 my ($self, $cb) = @_;
325 517
326 $self->{record} = []; 518 $self->{record} = $cb;
327}
328
329sub stop_record {
330 my ($self) = @_;
331 return delete $self->{record};
332} 519}
333 520
334sub map_scroll { 521sub map_scroll {
335 my ($self, $dx, $dy) = @_; 522 my ($self, $dx, $dy) = @_;
336 523
… …
338} 525}
339 526
340sub feed_map1a { 527sub feed_map1a {
341 my ($self, $data) = @_; 528 my ($self, $data) = @_;
342 529
343 $self->{map}->map1a_update ($data); 530 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
344 $self->{map_widget}->update; 531 $self->{map_widget}->update;
345} 532}
346 533
347sub magicmap { 534sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 535 my ($self, $w, $h, $x, $y, $data) = @_;
… …
357 or return; 544 or return;
358 545
359 my ($hash, $x, $y, $w, $h) = @$map_info; 546 my ($hash, $x, $y, $w, $h) = @$map_info;
360 547
361 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 548 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
362 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 549 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
363 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 550 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
364} 551}
365 552
366sub map_clear { 553sub map_clear {
367 my ($self) = @_; 554 my ($self) = @_;
… …
371 558
372 $self->{map}->clear; 559 $self->{map}->clear;
373 delete $self->{map_widget}{magicmap}; 560 delete $self->{map_widget}{magicmap};
374} 561}
375 562
563sub bg_fetch {
564 my ($self) = @_;
565
566 my $id;
567
568 do {
569 $id = pop @{$self->{bg_fetch}}
570 or return;
571 } while $self->{texture}[$id];
572
573 CFPlus::DB::get tilecache => $id, sub {
574 my ($data) = @_;
575
576 return unless $self->{map}; # stop when destroyed
577
578 $self->set_texture ($id => $data)
579 if defined $data;
580
581 $self->bg_fetch;
582 };
583}
376 584
377sub load_map($$$) { 585sub load_map($$$) {
378 my ($self, $hash, $x, $y) = @_; 586 my ($self, $hash, $x, $y) = @_;
379 587
380 if (defined (my $data = $self->{mapcache}->get ($hash))) { 588 my $gen = $self->{map_change_gen};
589
590 CFPlus::DB::get $self->{mapcache} => $hash, sub {
591 return unless $gen == $self->{map_change_gen};
592
593 my ($data) = @_;
594
595 if (defined $data) {
381 $data = Compress::LZF::decompress $data; 596 $data = Compress::LZF::decompress $data;
382 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 597 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
383 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
384 my $data = $self->{tilecache}->get ($id)
385 or next;
386 598
387 $self->set_texture ($id => $data); 599 my $inprogress = @{ $self->{bg_fetch} || [] };
600 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
601 $self->bg_fetch unless $inprogress;
388 } 602 }
389 } 603 };
390} 604}
391 605
392# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 606# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
393# (server resource,s latency, bandwidth), so this hack is warranted. 607# (server resource,s latency, bandwidth), so this hack is warranted.
394# the right fix is to make real tiled maps with an overview file 608# the right fix is to make real tiled maps with an overview file
… …
458 672
459 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 673 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
460 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 674 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
461 675
462 } else { 676 } else {
677 my $gen = $self->{map_change_gen};
463 $self->send_mapinfo ("spatial $path$tile", sub { 678 $self->send_mapinfo ("spatial $path$tile", sub {
679 return unless $gen == $self->{map_change_gen};
680
464 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 681 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 682
466 return if $mode ne "spatial"; 683 return if $mode ne "spatial";
467 684
468 $x += $self->{map}->ox; 685 $x += $self->{map}->ox;
… …
482 699
483sub map_change { 700sub map_change {
484 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 701 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
485 702
486 $self->flush_map; 703 $self->flush_map;
704
705 ++$self->{map_change_gen};
487 706
488 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 707 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
489 708
490 my $mapmapw = $self->{mapmap}->{w}; 709 my $mapmapw = $self->{mapmap}->{w};
491 my $mapmaph = $self->{mapmap}->{h}; 710 my $mapmaph = $self->{mapmap}->{h};
… …
508 $self->load_map ($hash, $x, $y); 727 $self->load_map ($hash, $x, $y);
509 $self->flood_fill (0, 0, 0, "", $hash, $flags); 728 $self->flood_fill (0, 0, 0, "", $hash, $flags);
510} 729}
511 730
512sub face_find { 731sub face_find {
513 my ($self, $facenum, $face) = @_; 732 my ($self, $facenum, $face, $cb) = @_;
514 733
515 my $hash = "$face->{chksum},$face->{name}"; 734 my $hash = "$face->{chksum},$face->{name}";
516 735
517 my $id = $self->{facemap}->get ($hash); 736 my $id = CFPlus::DB::get_tile_id_sync $hash;
518 737
519 unless ($id) {
520 # create new id for face
521 # I love transactions
522 for (1..100) {
523 my $txn = $CFPlus::DB_ENV->txn_begin;
524 my $status = $self->{facemap}->db_get (id => $id);
525 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
526 $id = ($id || 64) + 1;
527 if ($self->{facemap}->put (id => $id) == 0
528 && $self->{facemap}->put ($hash => $id) == 0) {
529 $txn->txn_commit;
530
531 goto gotid;
532 }
533 }
534 $txn->txn_abort;
535 }
536
537 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
538 }
539
540gotid:
541 $face->{id} = $id; 738 $face->{id} = $id;
542 $self->{map}->set_face ($facenum => $id);
543 $self->{faceid}[$facenum] = $id;#d# 739 $self->{faceid}[$facenum] = $id;
544 740
545 my $face = $self->{tilecache}->get ($id); 741 $self->{map}->set_tileid ($facenum => $id);
546 742
547 if ($face) { 743 CFPlus::DB::get tilecache => $id, $cb;
548 #$self->face_prefetch;
549 $face
550 } else {
551 my $tex = $self->{noface};
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 undef
554 };
555} 744}
556 745
557sub face_update { 746sub face_update {
558 my ($self, $facenum, $face, $changed) = @_; 747 my ($self, $facenum, $face, $changed) = @_;
559 748
560 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 749 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
750 if $changed;
561 751
562 $self->set_texture ($face->{id} => delete $face->{image}); 752 $self->set_texture ($face->{id} => delete $face->{image});
753}
754
755sub smooth_update {
756 my ($self, $facenum, $face) = @_;
757
758 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
563} 759}
564 760
565sub set_texture { 761sub set_texture {
566 my ($self, $id, $data) = @_; 762 my ($self, $id, $data) = @_;
567 763
568 $self->{texture}[$id] ||= do { 764 $self->{texture}[$id] = my $tex =
569 my $tex =
570 new_from_image CFPlus::Texture 765 new_from_image CFPlus::Texture
571 $data, minify => 1, mipmap => 1; 766 $data, minify => 1, mipmap => 1;
572 767
573 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 768 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
574 $self->{map_widget}->update; 769 $self->{map_widget}->update;
575
576 $tex
577 };
578} 770}
579 771
580sub sound_play { 772sub sound_play {
581 my ($self, $x, $y, $soundnum, $type) = @_; 773 my ($self, $x, $y, $soundnum, $type) = @_;
582 774
… …
592 $LAST_QUERY = $prompt; 784 $LAST_QUERY = $prompt;
593 785
594 $self->{query}-> ($self, $flags, $prompt); 786 $self->{query}-> ($self, $flags, $prompt);
595} 787}
596 788
597sub drawinfo { 789sub sanitise_xml($) {
598 my ($self, $color, $text) = @_; 790 local $_ = shift;
599 791
600 my @color = ( 792 # we now weed out all tags we do not support
793 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
794 # now all entities
795 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
796
797 # handle some elements
798 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
799 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
800
801 $_
802}
803
804our %NAME_TO_COLOR = (
805 black => 0,
806 white => 1,
807 darkblue => 2,
808 red => 3,
809 orange => 4,
810 lightblue => 5,
811 darkorange => 6,
812 green => 7,
813 darkgreen => 8,
814 grey => 9,
815 brown => 10,
816 yellow => 11,
817 tan => 12,
818);
819
820our @CF_COLOR = (
601 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 821 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
602 [1.00, 1.00, 1.00], 822 [1.00, 1.00, 1.00],
603 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 823 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
604 [1.00, 0.00, 0.00], 824 [1.00, 0.00, 0.00],
605 [1.00, 0.54, 0.00], 825 [1.00, 0.54, 0.00],
606 [0.11, 0.56, 1.00], 826 [0.11, 0.56, 1.00],
607 [0.93, 0.46, 0.00], 827 [0.93, 0.46, 0.00],
608 [0.18, 0.54, 0.34], 828 [0.18, 0.54, 0.34],
609 [0.56, 0.73, 0.56], 829 [0.56, 0.73, 0.56],
610 [0.80, 0.80, 0.80], 830 [0.80, 0.80, 0.80],
611 [0.75, 0.61, 0.20], 831 [0.75, 0.61, 0.20],
612 [0.99, 0.77, 0.26], 832 [0.99, 0.77, 0.26],
613 [0.74, 0.65, 0.41], 833 [0.74, 0.65, 0.41],
614 ); 834);
615 835
836sub msg {
837 my ($self, $color, $type, $text, @extra) = @_;
838
839 $text = sanitise_xml $text;
840
841 if (my $cb = $self->{cb_msg}{$type}) {
842 $_->($self, $color, $type, $text, @extra) for values %$cb;
843 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
844 $type =~ s/-/_/g;
845 $self->{$type} = $text;
846 } else {
616 $self->logprint ("info: ", $text); 847 $self->logprint ("msg: ", $text);
848 return if $color < 0; # negative color == ignore if not understood
617 849
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 850 my $fg = $CF_COLOR[$color % @CF_COLOR];
619 851
620 # try to create single paragraphs of multiple lines sent by the server 852 ## try to create single paragraphs of multiple lines sent by the server
853 # no longer neecssary with TRT servers
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 854 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
622 855
623 $text = CFPlus::asxml $text; 856 ::message ({ fg => $fg, markup => $_ })
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 857 for split /\n/, $text;
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
626 858
627 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
628 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
629 $self->{logview}->scroll_to_bottom;
630
631 $self->{statusbox}->add ($text, 859 $self->{statusbox}->add ($text,
632 group => $text, 860 group => $text,
633 fg => $color[$color], 861 fg => $fg,
634 timeout => $color >= 2 ? 180 : 10, 862 timeout => $color >= 2 ? 180 : 10,
635 tooltip_font => $::FONT_FIXED, 863 tooltip_font => $::FONT_FIXED,
636 ); 864 );
637} 865 }
638
639sub drawextinfo {
640 my ($self, $color, $type, $subtype, $message) = @_;
641
642 $self->drawinfo ($color, $message);
643} 866}
644 867
645sub spell_add { 868sub spell_add {
646 my ($self, $spell) = @_; 869 my ($self, $spell) = @_;
647 870
648 # try to create single paragraphs out of the multiple lines sent by the server 871 # try to create single paragraphs out of the multiple lines sent by the server
649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 872 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
650 $spell->{message} =~ s/\n+$//; 873 $spell->{message} =~ s/\n+$//;
651 $spell->{message} ||= "Server did not provide a description for this spell."; 874 $spell->{message} ||= "Server did not provide a description for this spell.";
652 875
653 $::SPELL_PAGE->add_spell ($spell); 876 $::SPELL_LIST->add_spell ($spell);
654 877
655 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 878 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
656 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 879 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
657} 880}
658 881
659sub spell_delete { 882sub spell_delete {
660 my ($self, $spell) = @_; 883 my ($self, $spell) = @_;
661 884
662 $::SPELL_PAGE->remove_spell ($spell); 885 $::SPELL_LIST->remove_spell ($spell);
886}
887
888sub setup {
889 my ($self, $setup) = @_;
890
891 $self->{map_widget}->set_tilesize ($self->{tilesize});
892 $::MAP->resize ($self->{mapw}, $self->{maph});
663} 893}
664 894
665sub addme_success { 895sub addme_success {
666 my ($self) = @_; 896 my ($self) = @_;
667 897
… …
873 $::SERVER_INFO->set_markup ( 1103 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 1104 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 1105 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1106 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1107 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1108 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1109 . "editing support $yesno[!!$self->{editor_support}]\n"
1110 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1111 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1112 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1113 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 1114 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 1115 );
1116
1117 ::setup_build_button ($self->{editor_support}->{builder_ui});
882} 1118}
883 1119
884sub logged_in { 1120sub logged_in {
885 my ($self) = @_; 1121 my ($self) = @_;
886 1122
887 $self->send_ext_req (cfplus_support => version => 1, sub { 1123 $self->send_ext_req (cfplus_support => version => 1, sub {
888 $self->{cfplus_ext} = $_[0]{version}; 1124 $self->{cfplus_ext} = $_[0]{version};
889 $self->update_server_info; 1125 $self->update_server_info;
890 1126
1127 if ($self->{cfplus_ext} >= 2) {
1128 $self->send_ext_req ("editor_support", sub {
1129 $self->{editor_support} = $_[0];
1130 $self->update_server_info;
1131
1132 0
1133 });
1134 }
1135
891 0 1136 0
892 }); 1137 });
893 1138
894 $self->update_server_info; 1139 $self->update_server_info;
895 1140
896 $self->send_command ("output-sync $::CFG->{output_sync}"); 1141 $self->send_command ("output-sync $::CFG->{output_sync}");
897 $self->send_command ("output-count $::CFG->{output_count}"); 1142 $self->send_command ("output-count $::CFG->{output_count}");
1143 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
898 $self->send_command ("pickup $::CFG->{pickup}"); 1144 $self->send_command ("pickup $::CFG->{pickup}");
1145}
1146
1147sub buildat {
1148 my ($self, $builditem, $x, $y) = @_;
1149
1150 if ($self->{cfplus_ext}) {
1151 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1152 }
899} 1153}
900 1154
901sub lookat { 1155sub lookat {
902 my ($self, $x, $y) = @_; 1156 my ($self, $x, $y) = @_;
903 1157
… …
921} 1175}
922 1176
923sub destroy { 1177sub destroy {
924 my ($self) = @_; 1178 my ($self) = @_;
925 1179
926 $self->{npc_dialog}->destroy 1180 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 1181 if $self->{npc_dialog};
928 1182
929 $self->SUPER::destroy; 1183 $self->SUPER::destroy;
1184
1185 %$self = ();
930} 1186}
931 1187
932package CFPlus::NPCDialog; 1188package CFPlus::NPCDialog;
933 1189
934our @ISA = 'CFPlus::UI::FancyFrame'; 1190our @ISA = 'CFPlus::UI::Toplevel';
935 1191
936sub new { 1192sub new {
937 my $class = shift; 1193 my $class = shift;
938 1194
939 my $self = $class->SUPER::new ( 1195 my $self = $class->SUPER::new (
… …
946 kw => { hi => 0, yes => 0, no => 0 }, 1202 kw => { hi => 0, yes => 0, no => 0 },
947 has_close_button => 1, 1203 has_close_button => 1,
948 @_, 1204 @_,
949 ); 1205 );
950 1206
951 Scalar::Util::weaken (my $this = $self); 1207 CFPlus::weaken (my $this = $self);
952 1208
953 $self->connect (delete => sub { $this->destroy; 1 }); 1209 $self->connect (delete => sub { $this->destroy; 1 });
954 1210
955 # better use a pane... 1211 # better use a pane...
956 $self->add (my $hbox = new CFPlus::UI::HBox); 1212 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
958 1214
959 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1215 $hbox->add (my $vbox = new CFPlus::UI::VBox);
960 1216
961 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1217 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
962 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1218 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
963 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1219 tooltip => "#npc_message_entry",
964 . "Sometimes you have to tell an NPC something you cannot find out during "
965 . "a normal conversation (such as a password). In those cases you have to use "
966 . "this text entry. You can also enter responses manually instead of using the response "
967 . "buttons below.",
968 on_activate => sub { 1220 on_activate => sub {
969 my ($entry, $text) = @_; 1221 my ($entry, $text) = @_;
970 1222
971 return unless $text =~ /\S/; 1223 return unless $text =~ /\S/;
972 1224
… …
1004}; 1256};
1005 1257
1006sub update_options { 1258sub update_options {
1007 my ($self) = @_; 1259 my ($self) = @_;
1008 1260
1009 Scalar::Util::weaken $self; 1261 CFPlus::weaken $self;
1010 1262
1011 $self->{options}->clear; 1263 $self->{options}->clear;
1012 $self->{options}->add ($self->{bye_button}); 1264 $self->{options}->add ($self->{bye_button});
1013 1265
1014 for my $kw (sort keys %{ $self->{kw} }) { 1266 for my $kw (sort keys %{ $self->{kw} }) {
… …
1023} 1275}
1024 1276
1025sub feed { 1277sub feed {
1026 my ($self, $msg) = @_; 1278 my ($self, $msg) = @_;
1027 1279
1028 Scalar::Util::weaken $self; 1280 CFPlus::weaken $self;
1029 1281
1030 if ($msg->{msgtype} eq "reply") { 1282 if ($msg->{msgtype} eq "reply") {
1031 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1283 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1032 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1284 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1033 1285
1034 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1286 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1035 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1287 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1036 my @link; 1288 my @link;
1037 $text =~ s{ 1289 $text =~ s{
1038 ($match) 1290 ($match)
1039 }{ 1291 }{
… …
1047 padding_y => 0, 1299 padding_y => 0,
1048 on_button_up => sub { 1300 on_button_up => sub {
1049 $self->send ($kw); 1301 $self->send ($kw);
1050 }; 1302 };
1051 1303
1052 chr 0xfffc 1304 "\x{fffc}"
1053 }giex; 1305 }giex;
1054 1306
1055 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1307 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1056 $self->{textview}->scroll_to_bottom; 1308 $self->{textview}->scroll_to_bottom;
1057 $self->update_options; 1309 $self->update_options;
… …
1084 1336
1085 $self->SUPER::destroy; 1337 $self->SUPER::destroy;
1086} 1338}
1087 1339
10881 13401
1341

Diff Legend

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