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.89 by elmex, Mon Dec 4 15:17:14 2006 UTC vs.
Revision 1.119 by root, Sat Jul 14 12:05:53 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;
11 14
12use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
13 16
14use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
15 18
16sub new { 19sub new {
17 my $class = shift; 20 my ($class, %arg) = @_;
18 21
19 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,
27 %{$arg{setup_req} || {}},
28 },
29 );
20 30
21 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
22 32
23 my @cmd_help = map { 33 my @cmd_help = map {
24 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
35 for @args; 45 for @args;
36 46
37 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
38 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
39 @args 49 @args
40 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
41 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
42 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_json) = @_;
73
74 if (defined $meta_json) {
75 my $meta = $self->{json_coder}->decode ($meta_json);
76 $meta->{path} = CFPlus::DB::path_of_res $chksum;
77 $self->{music_meta}{$chksum} = $meta;
78 } else {
79 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
80 $self->ask_face ($face, -100 - $pri, undef, sub {
81 my $len = length $_[1];
82 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
83
84 my $meta = $self->{json_coder}->decode ($meta_json);
85 $meta->{path} = CFPlus::DB::path_of_res $chksum;
86 $self->{music_meta}{$chksum} = $meta;
87
88 CFPlus::DB::write_file $meta->{path}, $data, sub { };
89 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub { };
90
91 ::message ({ markup => "downloaded song #$face, size $len octets" });
92 });
93 }
94
95 &::audio_music_set ($self->{songs});
96 }
97 }
98 }
99
100 if (my $play = $ev->{play}) {
101 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
102 }
103 });
104
105 $self->connect_ext (event_capabilities => sub {
106 my ($cap) = @_;
107
108 if (my $ts = $cap->{tileset}) {
109 if (my ($default) = grep $_->[2] & 1, @$ts) {
110 $self->{tileset} = $default;
111 $self->{tilesize} = $default->[3];
112 $self->setup_req (tileset => $default->[0]);
113
114 my $w = int $self->{mapw} * 32 / $self->{tilesize};
115 my $h = int $self->{maph} * 32 / $self->{tilesize};
116
117 $self->setup_req (mapsize => "${w}x${h}");
118 }
119 }
120 });
121
122 $self->{json_coder}
123 ->convert_blessed
124 ->filter_json_single_key_object (__widget_ref__ => sub {
125 $self->{widget}{$_[0]}
126 });
127
128 $self->connect_ext (ws_n => sub {
129 my ($arg) = @_;
130
131 $self->{widgetset}{$arg{id}} = {
132 w => {},
133 };
134 });
135
136 $self->connect_ext (ws_d => sub {
137 my ($arg) = @_;
138
139 my $ws = delete $self->{widgetset}{$arg{id}}
140 or return;
141
142 $_->destroy
143 for values %{$ws->{w}};
144 });
145
146 $self->connect_ext (ws_c => sub {
147 my ($arg) = @_;
148
149 my $args = $arg->{args} || {};
150
151 for my $ev (grep /^on_/, keys %$args) {
152 $args->{$ev} = sub {
153 my $id = shift->{s_id};
154 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
155
156 1
157 };
158 }
159
160 if (my $widget = eval {
161 local $SIG{__DIE__};
162 "CFPlus::UI::$arg->{class}"->new (
163 %$args,
164 s_ws => $arg->{ws},
165 s_id => $arg->{id},
166 )
167 }
168 ) {
169 $self->{widget}{$arg->{id}}
170 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
171 = $widget;
172
173 $widget->connect (on_destroy => sub {
174 my ($widget) = @_;
175
176 delete $self->{widget}{$widget->{s_id}};
177 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
178 });
179 } else {
180 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
181 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
182 }
183 });
184
185 $self->connect_ext (w_c => sub {
186 my ($arg) = @_;
187
188 my $w = $self->{widget}{$arg->{id}}
189 or return;
190 my $m = $arg->{name};
191
192 my $a = $arg->{args} || [];
193
194 if (exists $arg->{rid}) {
195 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
196 } else {
197 $w->$m (@$a);
198 }
199 });
200
201 $self->connect_ext (w_s => sub {
202 my ($arg) = @_;
203
204 my $w = $self->{widget}{$arg->{id}}
205 or return;
206
207 $w->{$arg->{name}} = $arg->{value};
208 });
209
210 $self->connect_ext (w_g => sub {
211 my ($arg) = @_;
212
213 my $w = $self->{widget}{$arg->{id}}
214 or return;
215
216 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
217 });
218
219 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
220 for my $ws (values %{delete $self->{widgetset} || {}}) {
221 $_->destroy
222 for values %{delete $ws->{w} || {}};
223 }
224 });
225
43 $self->{map_widget}->add_command (@$_) 226 $self->{map_widget}->add_command (@$_)
44 for @cmd_help; 227 for @cmd_help;
45
46 $self->{noface} = new_from_file CFPlus::Texture
47 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
48 228
49 { 229 {
50 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 230 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 231 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
52 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 232 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
53 } 233 }
54 234
235 {
236 $self->{noface} = my $tex = new_from_file CFPlus::Texture
237 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
238 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
239 }
240
55 $self->{open_container} = 0; 241 $self->{open_container} = 0;
56 242
57 # "global"
58 $self->{tilecache} = CFPlus::db_table "tilecache"
59 or die "tilecache: unable to open database table";
60 $self->{facemap} = CFPlus::db_table "facemap"
61 or die "facemap: unable to open database table";
62
63 # per server 243 # per server
64 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 244 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
65 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
66 245
67 $self 246 $self
68} 247}
69 248
70sub logprint { 249sub logprint {
… …
227 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 406 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
228 $::GAUGES->{food} ->set_value ($fo, $fo_m); 407 $::GAUGES->{food} ->set_value ($fo, $fo_m);
229 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 408 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
230 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 409 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
231 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 410 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
232 my $rng = $stats->{+CS_STAT_RANGE}; 411 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
233 $rng =~ s/^Range: //; # thank you so much dear server
234 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
235 my $title = $stats->{+CS_STAT_TITLE}; 412 my $title = $stats->{+CS_STAT_TITLE};
236 $title =~ s/^Player: //; 413 $title =~ s/^Player: //;
237 $::STATWIDS->{title} ->set_text ("Title: " . $title); 414 $::STATWIDS->{title} ->set_text ("Title: " . $title);
238 415
239 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 416 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
288 if ($ev->{button} == 1) { 465 if ($ev->{button} == 1) {
289 $::CONN->user_send ("ready_skill $name"); 466 $::CONN->user_send ("ready_skill $name");
290 } elsif ($ev->{button} == 2) { 467 } elsif ($ev->{button} == 2) {
291 $::CONN->user_send ("use_skill $name"); 468 $::CONN->user_send ("use_skill $name");
292 } elsif ($ev->{button} == 3) { 469 } elsif ($ev->{button} == 3) {
470 my $shortname = CFPlus::shorten $name, 14;
293 (new CFPlus::UI::Menu 471 (new CFPlus::UI::Menu
294 items => [ 472 items => [
295 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 473 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
296 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 474 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
297 ], 475 ],
298 )->popup ($ev); 476 )->popup ($ev);
299 } else { 477 } else {
300 return 0; 478 return 0;
301 } 479 }
… …
318 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 496 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
319 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 497 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
320 } 498 }
321} 499}
322 500
501sub macro_send {
502 my ($self, $macro) = @_;
503
504 for my $cmd (@{ $macro->{action} }) {
505 $self->send_command ($cmd);
506 }
507}
508
323sub user_send { 509sub user_send {
324 my ($self, $command) = @_; 510 my ($self, $command) = @_;
325 511
326 push @{$self->{record}}, $command 512 $self->{record}->($command)
327 if $self->{record}; 513 if $self->{record};
328 514
329 $self->logprint ("send: ", $command); 515 $self->logprint ("send: ", $command);
330 $self->send_command ($command); 516 $self->send_command ($command);
331 ::status ($command); 517 ::status ($command);
332} 518}
333 519
334sub start_record { 520sub record {
335 my ($self) = @_; 521 my ($self, $cb) = @_;
336 522
337 $self->{record} = []; 523 $self->{record} = $cb;
338}
339
340sub stop_record {
341 my ($self) = @_;
342 return delete $self->{record};
343} 524}
344 525
345sub map_scroll { 526sub map_scroll {
346 my ($self, $dx, $dy) = @_; 527 my ($self, $dx, $dy) = @_;
347 528
… …
368 or return; 549 or return;
369 550
370 my ($hash, $x, $y, $w, $h) = @$map_info; 551 my ($hash, $x, $y, $w, $h) = @$map_info;
371 552
372 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 553 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
373 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 554 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
374 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 555 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
375} 556}
376 557
377sub map_clear { 558sub map_clear {
378 my ($self) = @_; 559 my ($self) = @_;
… …
382 563
383 $self->{map}->clear; 564 $self->{map}->clear;
384 delete $self->{map_widget}{magicmap}; 565 delete $self->{map_widget}{magicmap};
385} 566}
386 567
568sub bg_fetch {
569 my ($self) = @_;
570
571 my $id;
572
573 do {
574 $id = pop @{$self->{bg_fetch}}
575 or return;
576 } while $self->{texture}[$id];
577
578 CFPlus::DB::get tilecache => $id, sub {
579 my ($data) = @_;
580
581 return unless $self->{map}; # stop when destroyed
582
583 $self->set_texture ($id => $data)
584 if defined $data;
585
586 $self->bg_fetch;
587 };
588}
387 589
388sub load_map($$$) { 590sub load_map($$$) {
389 my ($self, $hash, $x, $y) = @_; 591 my ($self, $hash, $x, $y) = @_;
390 592
391 if (defined (my $data = $self->{mapcache}->get ($hash))) { 593 my $gen = $self->{map_change_gen};
594
595 CFPlus::DB::get $self->{mapcache} => $hash, sub {
596 return unless $gen == $self->{map_change_gen};
597
598 my ($data) = @_;
599
600 if (defined $data) {
392 $data = Compress::LZF::decompress $data; 601 $data = Compress::LZF::decompress $data;
393 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 602 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
394 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
395 my $data = $self->{tilecache}->get ($id)
396 or next;
397 603
398 $self->set_texture ($id => $data); 604 my $inprogress = @{ $self->{bg_fetch} || [] };
605 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
606 $self->bg_fetch unless $inprogress;
399 } 607 }
400 } 608 };
401} 609}
402 610
403# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 611# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
404# (server resource,s latency, bandwidth), so this hack is warranted. 612# (server resource,s latency, bandwidth), so this hack is warranted.
405# the right fix is to make real tiled maps with an overview file 613# the right fix is to make real tiled maps with an overview file
… …
469 677
470 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 678 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
471 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 679 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
472 680
473 } else { 681 } else {
682 my $gen = $self->{map_change_gen};
474 $self->send_mapinfo ("spatial $path$tile", sub { 683 $self->send_mapinfo ("spatial $path$tile", sub {
684 return unless $gen == $self->{map_change_gen};
685
475 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 686 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
476 687
477 return if $mode ne "spatial"; 688 return if $mode ne "spatial";
478 689
479 $x += $self->{map}->ox; 690 $x += $self->{map}->ox;
… …
493 704
494sub map_change { 705sub map_change {
495 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 706 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
496 707
497 $self->flush_map; 708 $self->flush_map;
709
710 ++$self->{map_change_gen};
498 711
499 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 712 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
500 713
501 my $mapmapw = $self->{mapmap}->{w}; 714 my $mapmapw = $self->{mapmap}->{w};
502 my $mapmaph = $self->{mapmap}->{h}; 715 my $mapmaph = $self->{mapmap}->{h};
… …
519 $self->load_map ($hash, $x, $y); 732 $self->load_map ($hash, $x, $y);
520 $self->flood_fill (0, 0, 0, "", $hash, $flags); 733 $self->flood_fill (0, 0, 0, "", $hash, $flags);
521} 734}
522 735
523sub face_find { 736sub face_find {
524 my ($self, $facenum, $face) = @_; 737 my ($self, $facenum, $face, $cb) = @_;
525 738
526 my $hash = "$face->{chksum},$face->{name}"; 739 my $hash = "$face->{chksum},$face->{name}";
527 740
528 my $id = $self->{facemap}->get ($hash); 741 my $id = CFPlus::DB::get_tile_id_sync $hash;
529 742
530 unless ($id) {
531 # create new id for face
532 # I love transactions
533 for (1..100) {
534 my $txn = $CFPlus::DB_ENV->txn_begin;
535 my $status = $self->{facemap}->db_get (id => $id);
536 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
537 $id = ($id || 64) + 1;
538 if ($self->{facemap}->put (id => $id) == 0
539 && $self->{facemap}->put ($hash => $id) == 0) {
540 $txn->txn_commit;
541
542 goto gotid;
543 }
544 }
545 $txn->txn_abort;
546 }
547
548 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
549 }
550
551gotid:
552 $face->{id} = $id; 743 $face->{id} = $id;
553 $self->{map}->set_face ($facenum => $id);
554 $self->{faceid}[$facenum] = $id;#d# 744 $self->{faceid}[$facenum] = $id;
555 745
556 my $face = $self->{tilecache}->get ($id); 746 $self->{map}->set_tileid ($facenum => $id);
557 747
558 if ($face) { 748 CFPlus::DB::get tilecache => $id, $cb;
559 #$self->face_prefetch;
560 $face
561 } else {
562 my $tex = $self->{noface};
563 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
564 undef
565 };
566} 749}
567 750
568sub face_update { 751sub face_update {
569 my ($self, $facenum, $face, $changed) = @_; 752 my ($self, $facenum, $face, $changed) = @_;
570 753
571 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 754 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
755 if $changed;
572 756
573 $self->set_texture ($face->{id} => delete $face->{image}); 757 $self->set_texture ($face->{id} => delete $face->{image});
758}
759
760sub smooth_update {
761 my ($self, $facenum, $face) = @_;
762
763 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
574} 764}
575 765
576sub set_texture { 766sub set_texture {
577 my ($self, $id, $data) = @_; 767 my ($self, $id, $data) = @_;
578 768
769 return unless $self->{map};
770
579 $self->{texture}[$id] ||= do { 771 $self->{texture}[$id] = my $tex =
580 my $tex =
581 new_from_image CFPlus::Texture 772 new_from_image CFPlus::Texture
582 $data, minify => 1, mipmap => 1; 773 $data, minify => 1, mipmap => 1;
583 774
584 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 775 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
585 $self->{map_widget}->update; 776 $self->{map_widget}->update;
586
587 $tex
588 };
589} 777}
590 778
591sub sound_play { 779sub sound_play {
592 my ($self, $x, $y, $soundnum, $type) = @_; 780 my ($self, $x, $y, $soundnum, $type) = @_;
593 781
… …
603 $LAST_QUERY = $prompt; 791 $LAST_QUERY = $prompt;
604 792
605 $self->{query}-> ($self, $flags, $prompt); 793 $self->{query}-> ($self, $flags, $prompt);
606} 794}
607 795
608sub drawinfo { 796sub sanitise_xml($) {
609 my ($self, $color, $text) = @_; 797 local $_ = shift;
610 798
611 my @color = ( 799 # we now weed out all tags we do not support
800 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
801 # now all entities
802 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
803
804 # handle some elements
805 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
806 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
807
808 $_
809}
810
811our %NAME_TO_COLOR = (
812 black => 0,
813 white => 1,
814 darkblue => 2,
815 red => 3,
816 orange => 4,
817 lightblue => 5,
818 darkorange => 6,
819 green => 7,
820 darkgreen => 8,
821 grey => 9,
822 brown => 10,
823 yellow => 11,
824 tan => 12,
825);
826
827our @CF_COLOR = (
612 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 828 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
613 [1.00, 1.00, 1.00], 829 [1.00, 1.00, 1.00],
614 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 830 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
615 [1.00, 0.00, 0.00], 831 [1.00, 0.00, 0.00],
616 [1.00, 0.54, 0.00], 832 [1.00, 0.54, 0.00],
617 [0.11, 0.56, 1.00], 833 [0.11, 0.56, 1.00],
618 [0.93, 0.46, 0.00], 834 [0.93, 0.46, 0.00],
619 [0.18, 0.54, 0.34], 835 [0.18, 0.54, 0.34],
620 [0.56, 0.73, 0.56], 836 [0.56, 0.73, 0.56],
621 [0.80, 0.80, 0.80], 837 [0.80, 0.80, 0.80],
622 [0.75, 0.61, 0.20], 838 [0.75, 0.61, 0.20],
623 [0.99, 0.77, 0.26], 839 [0.99, 0.77, 0.26],
624 [0.74, 0.65, 0.41], 840 [0.74, 0.65, 0.41],
625 ); 841);
626 842
843sub msg {
844 my ($self, $color, $type, $text, @extra) = @_;
845
846 $text = sanitise_xml $text;
847
848 if (my $cb = $self->{cb_msg}{$type}) {
849 $_->($self, $color, $type, $text, @extra) for values %$cb;
850 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
851 $type =~ s/-/_/g;
852 $self->{$type} = $text;
853 } else {
627 $self->logprint ("info: ", $text); 854 $self->logprint ("msg: ", $text);
855 return if $color < 0; # negative color == ignore if not understood
628 856
857 my $fg = $CF_COLOR[$color % @CF_COLOR];
858
629 # try to create single paragraphs of multiple lines sent by the server 859 ## try to create single paragraphs of multiple lines sent by the server
860 # no longer neecssary with TRT servers
630 $text =~ s/(?<=\S)\n(?=\w)/ /g; 861 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
631 862
632 $text = CFPlus::asxml $text;
633 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
634 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
635
636 ::message ({ fg => $color[$color], markup => $_ }) 863 ::message ({ fg => $fg, markup => $_ })
637 for split /\n/, $text; 864 for split /\n/, $text;
638 865
639 $self->{statusbox}->add ($text, 866 $self->{statusbox}->add ($text,
640 group => $text, 867 group => $text,
641 fg => $color[$color], 868 fg => $fg,
642 timeout => $color >= 2 ? 180 : 10, 869 timeout => $color >= 2 ? 180 : 10,
643 tooltip_font => $::FONT_FIXED, 870 tooltip_font => $::FONT_FIXED,
644 ); 871 );
645} 872 }
646
647sub drawextinfo {
648 my ($self, $color, $type, $subtype, $message) = @_;
649
650 $self->drawinfo ($color, $message);
651} 873}
652 874
653sub spell_add { 875sub spell_add {
654 my ($self, $spell) = @_; 876 my ($self, $spell) = @_;
655 877
… …
671} 893}
672 894
673sub setup { 895sub setup {
674 my ($self, $setup) = @_; 896 my ($self, $setup) = @_;
675 897
898 $self->{map_widget}->set_tilesize ($self->{tilesize});
676 $::MAP->resize ($self->{mapw}, $self->{maph}); 899 $::MAP->resize ($self->{mapw}, $self->{maph});
677} 900}
678 901
679sub addme_success { 902sub addme_success {
680 my ($self) = @_; 903 my ($self) = @_;
… …
887 $::SERVER_INFO->set_markup ( 1110 $::SERVER_INFO->set_markup (
888 "server <tt>$self->{host}:$self->{port}</tt>\n" 1111 "server <tt>$self->{host}:$self->{port}</tt>\n"
889 . "protocol version <tt>$self->{version}</tt>\n" 1112 . "protocol version <tt>$self->{version}</tt>\n"
890 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1113 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
891 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1114 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1115 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
892 . "editing support $yesno[!!$self->{editor_support}]\n" 1116 . "editing support $yesno[!!$self->{editor_support}]\n"
893 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1117 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1118 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1119 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1120 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
896 . "map size $self->{mapw}×$self->{maph}\n" 1121 . "map size $self->{mapw}×$self->{maph}\n"
897 ); 1122 );
898 1123
… …
920 1145
921 $self->update_server_info; 1146 $self->update_server_info;
922 1147
923 $self->send_command ("output-sync $::CFG->{output_sync}"); 1148 $self->send_command ("output-sync $::CFG->{output_sync}");
924 $self->send_command ("output-count $::CFG->{output_count}"); 1149 $self->send_command ("output-count $::CFG->{output_count}");
1150 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
925 $self->send_command ("pickup $::CFG->{pickup}"); 1151 $self->send_command ("pickup $::CFG->{pickup}");
926} 1152}
927 1153
928sub buildat { 1154sub buildat {
929 my ($self, $builditem, $x, $y) = @_; 1155 my ($self, $builditem, $x, $y) = @_;
… …
960 1186
961 (delete $self->{npc_dialog})->destroy 1187 (delete $self->{npc_dialog})->destroy
962 if $self->{npc_dialog}; 1188 if $self->{npc_dialog};
963 1189
964 $self->SUPER::destroy; 1190 $self->SUPER::destroy;
1191
1192 %$self = ();
965} 1193}
966 1194
967package CFPlus::NPCDialog; 1195package CFPlus::NPCDialog;
968 1196
969our @ISA = 'CFPlus::UI::Toplevel'; 1197our @ISA = 'CFPlus::UI::Toplevel';
… …
981 kw => { hi => 0, yes => 0, no => 0 }, 1209 kw => { hi => 0, yes => 0, no => 0 },
982 has_close_button => 1, 1210 has_close_button => 1,
983 @_, 1211 @_,
984 ); 1212 );
985 1213
986 Scalar::Util::weaken (my $this = $self); 1214 CFPlus::weaken (my $this = $self);
987 1215
988 $self->connect (delete => sub { $this->destroy; 1 }); 1216 $self->connect (delete => sub { $this->destroy; 1 });
989 1217
990 # better use a pane... 1218 # better use a pane...
991 $self->add (my $hbox = new CFPlus::UI::HBox); 1219 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1035}; 1263};
1036 1264
1037sub update_options { 1265sub update_options {
1038 my ($self) = @_; 1266 my ($self) = @_;
1039 1267
1040 Scalar::Util::weaken $self; 1268 CFPlus::weaken $self;
1041 1269
1042 $self->{options}->clear; 1270 $self->{options}->clear;
1043 $self->{options}->add ($self->{bye_button}); 1271 $self->{options}->add ($self->{bye_button});
1044 1272
1045 for my $kw (sort keys %{ $self->{kw} }) { 1273 for my $kw (sort keys %{ $self->{kw} }) {
… …
1054} 1282}
1055 1283
1056sub feed { 1284sub feed {
1057 my ($self, $msg) = @_; 1285 my ($self, $msg) = @_;
1058 1286
1059 Scalar::Util::weaken $self; 1287 CFPlus::weaken $self;
1060 1288
1061 if ($msg->{msgtype} eq "reply") { 1289 if ($msg->{msgtype} eq "reply") {
1062 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1290 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1063 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1291 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1064 1292
1065 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1293 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1066 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1294 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1067 my @link; 1295 my @link;
1068 $text =~ s{ 1296 $text =~ s{
1069 ($match) 1297 ($match)
1070 }{ 1298 }{

Diff Legend

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