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.90 by root, Wed Dec 6 00:15:12 2006 UTC vs.
Revision 1.113 by root, Thu Jul 12 17:56:51 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 my $pri = -100;
63 for my $face (@$faces) {
64 if (defined (my $chksum = $ev->{chksum}{$face})) {
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 ::message ({ markup => "starting to download song #$face, check your output-rate setting if your connection gets laggy." });
71 $self->ask_face ($face, $pri, undef, sub {
72 my $num = $_[0];
73 my $len = length $_[1];
74 my ($meta, $data) = unpack "(w/a*)*", $_[1];
75
76 CFPlus::DB::write_file $chksum, $data, sub { };
77 CFPlus::DB::put resmap => $chksum => $meta, sub { };
78
79 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
80 ::message ({ markup => "downloaded song #$face, size $len octets" });
81
82 &::audio_music_set ($self->{songs});
83 });
84 }
85
86 push @songs, $self->{music_map}{$face};
87 --$pri;
88 }
89
90 &::audio_music_set ($self->{songs} = \@songs);
91 });
92
93 $self->connect_ext (event_capabilities => sub {
94 my ($cap) = @_;
95
96 if (my $ts = $cap->{tileset}) {
97 if (my ($default) = grep $_->[2] & 1, @$ts) {
98 $self->{tileset} = $default;
99 $self->{tilesize} = $default->[3];
100 $self->setup_req (tileset => $default->[0]);
101
102 my $w = int $self->{mapw} * 32 / $self->{tilesize};
103 my $h = int $self->{maph} * 32 / $self->{tilesize};
104
105 $self->setup_req (mapsize => "${w}x${h}");
106 }
107 }
108 });
109
110 $self->{json_coder}
111 ->convert_blessed
112 ->filter_json_single_key_object (__widget_ref__ => sub {
113 $self->{widget}{$_[0]}
114 });
115
116 $self->connect_ext (ws_n => sub {
117 my ($arg) = @_;
118
119 $self->{widgetset}{$arg{id}} = {
120 w => {},
121 };
122 });
123
124 $self->connect_ext (ws_d => sub {
125 my ($arg) = @_;
126
127 my $ws = delete $self->{widgetset}{$arg{id}}
128 or return;
129
130 $_->destroy
131 for values %{$ws->{w}};
132 });
133
134 $self->connect_ext (ws_c => sub {
135 my ($arg) = @_;
136
137 my $args = $arg->{args} || {};
138
139 for my $ev (grep /^on_/, keys %$args) {
140 $args->{$ev} = sub {
141 my $id = shift->{s_id};
142 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
143
144 1
145 };
146 }
147
148 if (my $widget = eval {
149 local $SIG{__DIE__};
150 "CFPlus::UI::$arg->{class}"->new (
151 %$args,
152 s_ws => $arg->{ws},
153 s_id => $arg->{id},
154 )
155 }
156 ) {
157 $self->{widget}{$arg->{id}}
158 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
159 = $widget;
160
161 $widget->connect (on_destroy => sub {
162 my ($widget) = @_;
163
164 delete $self->{widget}{$widget->{s_id}};
165 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
166 });
167 } else {
168 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
169 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
170 }
171 });
172
173 $self->connect_ext (w_c => sub {
174 my ($arg) = @_;
175
176 my $w = $self->{widget}{$arg->{id}}
177 or return;
178 my $m = $arg->{name};
179
180 my $a = $arg->{args} || [];
181
182 if (exists $arg->{rid}) {
183 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
184 } else {
185 $w->$m (@$a);
186 }
187 });
188
189 $self->connect_ext (w_s => sub {
190 my ($arg) = @_;
191
192 my $w = $self->{widget}{$arg->{id}}
193 or return;
194
195 $w->{$arg->{name}} = $arg->{value};
196 });
197
198 $self->connect_ext (w_g => sub {
199 my ($arg) = @_;
200
201 my $w = $self->{widget}{$arg->{id}}
202 or return;
203
204 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
205 });
206
207 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
208 for my $ws (values %{delete $self->{widgetset} || {}}) {
209 $_->destroy
210 for values %{delete $ws->{w} || {}};
211 }
212 });
213
43 $self->{map_widget}->add_command (@$_) 214 $self->{map_widget}->add_command (@$_)
44 for @cmd_help; 215 for @cmd_help;
45
46 $self->{noface} = new_from_file CFPlus::Texture
47 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
48 216
49 { 217 {
50 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 218 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 219 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
52 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 220 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
53 } 221 }
54 222
223 {
224 $self->{noface} = my $tex = new_from_file CFPlus::Texture
225 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
226 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
227 }
228
55 $self->{open_container} = 0; 229 $self->{open_container} = 0;
56 230
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 231 # per server
64 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 232 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
65 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
66 233
67 $self 234 $self
68} 235}
69 236
70sub logprint { 237sub logprint {
… …
227 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 394 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
228 $::GAUGES->{food} ->set_value ($fo, $fo_m); 395 $::GAUGES->{food} ->set_value ($fo, $fo_m);
229 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 396 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
230 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 397 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
231 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 398 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
232 my $rng = $stats->{+CS_STAT_RANGE}; 399 $::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}; 400 my $title = $stats->{+CS_STAT_TITLE};
236 $title =~ s/^Player: //; 401 $title =~ s/^Player: //;
237 $::STATWIDS->{title} ->set_text ("Title: " . $title); 402 $::STATWIDS->{title} ->set_text ("Title: " . $title);
238 403
239 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 404 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
291 $::CONN->user_send ("use_skill $name"); 456 $::CONN->user_send ("use_skill $name");
292 } elsif ($ev->{button} == 3) { 457 } elsif ($ev->{button} == 3) {
293 my $shortname = CFPlus::shorten $name, 14; 458 my $shortname = CFPlus::shorten $name, 14;
294 (new CFPlus::UI::Menu 459 (new CFPlus::UI::Menu
295 items => [ 460 items => [
296 ["bind <i>ready_skill $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 461 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
297 ["bind <i>use_skill $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 462 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
298 ], 463 ],
299 )->popup ($ev); 464 )->popup ($ev);
300 } else { 465 } else {
301 return 0; 466 return 0;
302 } 467 }
… …
319 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 484 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
320 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 485 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
321 } 486 }
322} 487}
323 488
489sub macro_send {
490 my ($self, $macro) = @_;
491
492 for my $cmd (@{ $macro->{action} }) {
493 $self->send_command ($cmd);
494 }
495}
496
324sub user_send { 497sub user_send {
325 my ($self, $command) = @_; 498 my ($self, $command) = @_;
326 499
327 push @{$self->{record}}, $command 500 $self->{record}->($command)
328 if $self->{record}; 501 if $self->{record};
329 502
330 $self->logprint ("send: ", $command); 503 $self->logprint ("send: ", $command);
331 $self->send_command ($command); 504 $self->send_command ($command);
332 ::status ($command); 505 ::status ($command);
333} 506}
334 507
335sub start_record { 508sub record {
336 my ($self) = @_; 509 my ($self, $cb) = @_;
337 510
338 $self->{record} = []; 511 $self->{record} = $cb;
339}
340
341sub stop_record {
342 my ($self) = @_;
343 return delete $self->{record};
344} 512}
345 513
346sub map_scroll { 514sub map_scroll {
347 my ($self, $dx, $dy) = @_; 515 my ($self, $dx, $dy) = @_;
348 516
… …
369 or return; 537 or return;
370 538
371 my ($hash, $x, $y, $w, $h) = @$map_info; 539 my ($hash, $x, $y, $w, $h) = @$map_info;
372 540
373 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 541 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
374 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 542 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
375 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 543 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
376} 544}
377 545
378sub map_clear { 546sub map_clear {
379 my ($self) = @_; 547 my ($self) = @_;
… …
383 551
384 $self->{map}->clear; 552 $self->{map}->clear;
385 delete $self->{map_widget}{magicmap}; 553 delete $self->{map_widget}{magicmap};
386} 554}
387 555
556sub bg_fetch {
557 my ($self) = @_;
558
559 my $id;
560
561 do {
562 $id = pop @{$self->{bg_fetch}}
563 or return;
564 } while $self->{texture}[$id];
565
566 CFPlus::DB::get tilecache => $id, sub {
567 my ($data) = @_;
568
569 return unless $self->{map}; # stop when destroyed
570
571 $self->set_texture ($id => $data)
572 if defined $data;
573
574 $self->bg_fetch;
575 };
576}
388 577
389sub load_map($$$) { 578sub load_map($$$) {
390 my ($self, $hash, $x, $y) = @_; 579 my ($self, $hash, $x, $y) = @_;
391 580
392 if (defined (my $data = $self->{mapcache}->get ($hash))) { 581 my $gen = $self->{map_change_gen};
582
583 CFPlus::DB::get $self->{mapcache} => $hash, sub {
584 return unless $gen == $self->{map_change_gen};
585
586 my ($data) = @_;
587
588 if (defined $data) {
393 $data = Compress::LZF::decompress $data; 589 $data = Compress::LZF::decompress $data;
394 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 590 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
395 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
396 my $data = $self->{tilecache}->get ($id)
397 or next;
398 591
399 $self->set_texture ($id => $data); 592 my $inprogress = @{ $self->{bg_fetch} || [] };
593 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
594 $self->bg_fetch unless $inprogress;
400 } 595 }
401 } 596 };
402} 597}
403 598
404# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 599# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
405# (server resource,s latency, bandwidth), so this hack is warranted. 600# (server resource,s latency, bandwidth), so this hack is warranted.
406# the right fix is to make real tiled maps with an overview file 601# the right fix is to make real tiled maps with an overview file
… …
470 665
471 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 666 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
472 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 667 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
473 668
474 } else { 669 } else {
670 my $gen = $self->{map_change_gen};
475 $self->send_mapinfo ("spatial $path$tile", sub { 671 $self->send_mapinfo ("spatial $path$tile", sub {
672 return unless $gen == $self->{map_change_gen};
673
476 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 674 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
477 675
478 return if $mode ne "spatial"; 676 return if $mode ne "spatial";
479 677
480 $x += $self->{map}->ox; 678 $x += $self->{map}->ox;
… …
494 692
495sub map_change { 693sub map_change {
496 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 694 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
497 695
498 $self->flush_map; 696 $self->flush_map;
697
698 ++$self->{map_change_gen};
499 699
500 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 700 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
501 701
502 my $mapmapw = $self->{mapmap}->{w}; 702 my $mapmapw = $self->{mapmap}->{w};
503 my $mapmaph = $self->{mapmap}->{h}; 703 my $mapmaph = $self->{mapmap}->{h};
… …
520 $self->load_map ($hash, $x, $y); 720 $self->load_map ($hash, $x, $y);
521 $self->flood_fill (0, 0, 0, "", $hash, $flags); 721 $self->flood_fill (0, 0, 0, "", $hash, $flags);
522} 722}
523 723
524sub face_find { 724sub face_find {
525 my ($self, $facenum, $face) = @_; 725 my ($self, $facenum, $face, $cb) = @_;
526 726
527 my $hash = "$face->{chksum},$face->{name}"; 727 my $hash = "$face->{chksum},$face->{name}";
528 728
529 my $id = $self->{facemap}->get ($hash); 729 my $id = CFPlus::DB::get_tile_id_sync $hash;
530 730
531 unless ($id) {
532 # create new id for face
533 # I love transactions
534 for (1..100) {
535 my $txn = $CFPlus::DB_ENV->txn_begin;
536 my $status = $self->{facemap}->db_get (id => $id);
537 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
538 $id = ($id || 64) + 1;
539 if ($self->{facemap}->put (id => $id) == 0
540 && $self->{facemap}->put ($hash => $id) == 0) {
541 $txn->txn_commit;
542
543 goto gotid;
544 }
545 }
546 $txn->txn_abort;
547 }
548
549 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
550 }
551
552gotid:
553 $face->{id} = $id; 731 $face->{id} = $id;
554 $self->{map}->set_face ($facenum => $id);
555 $self->{faceid}[$facenum] = $id;#d# 732 $self->{faceid}[$facenum] = $id;
556 733
557 my $face = $self->{tilecache}->get ($id); 734 $self->{map}->set_tileid ($facenum => $id);
558 735
559 if ($face) { 736 CFPlus::DB::get tilecache => $id, $cb;
560 #$self->face_prefetch;
561 $face
562 } else {
563 my $tex = $self->{noface};
564 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
565 undef
566 };
567} 737}
568 738
569sub face_update { 739sub face_update {
570 my ($self, $facenum, $face, $changed) = @_; 740 my ($self, $facenum, $face, $changed) = @_;
571 741
572 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 742 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
743 if $changed;
573 744
574 $self->set_texture ($face->{id} => delete $face->{image}); 745 $self->set_texture ($face->{id} => delete $face->{image});
746}
747
748sub smooth_update {
749 my ($self, $facenum, $face) = @_;
750
751 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
575} 752}
576 753
577sub set_texture { 754sub set_texture {
578 my ($self, $id, $data) = @_; 755 my ($self, $id, $data) = @_;
579 756
580 $self->{texture}[$id] ||= do { 757 $self->{texture}[$id] = my $tex =
581 my $tex =
582 new_from_image CFPlus::Texture 758 new_from_image CFPlus::Texture
583 $data, minify => 1, mipmap => 1; 759 $data, minify => 1, mipmap => 1;
584 760
585 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 761 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
586 $self->{map_widget}->update; 762 $self->{map_widget}->update;
587
588 $tex
589 };
590} 763}
591 764
592sub sound_play { 765sub sound_play {
593 my ($self, $x, $y, $soundnum, $type) = @_; 766 my ($self, $x, $y, $soundnum, $type) = @_;
594 767
… …
604 $LAST_QUERY = $prompt; 777 $LAST_QUERY = $prompt;
605 778
606 $self->{query}-> ($self, $flags, $prompt); 779 $self->{query}-> ($self, $flags, $prompt);
607} 780}
608 781
609sub drawinfo { 782sub sanitise_xml($) {
610 my ($self, $color, $text) = @_; 783 local $_ = shift;
611 784
612 my @color = ( 785 # we now weed out all tags we do not support
786 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
787 # now all entities
788 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
789
790 # handle some elements
791 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
792 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
793
794 $_
795}
796
797our %NAME_TO_COLOR = (
798 black => 0,
799 white => 1,
800 darkblue => 2,
801 red => 3,
802 orange => 4,
803 lightblue => 5,
804 darkorange => 6,
805 green => 7,
806 darkgreen => 8,
807 grey => 9,
808 brown => 10,
809 yellow => 11,
810 tan => 12,
811);
812
813our @CF_COLOR = (
613 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 814 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
614 [1.00, 1.00, 1.00], 815 [1.00, 1.00, 1.00],
615 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 816 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
616 [1.00, 0.00, 0.00], 817 [1.00, 0.00, 0.00],
617 [1.00, 0.54, 0.00], 818 [1.00, 0.54, 0.00],
618 [0.11, 0.56, 1.00], 819 [0.11, 0.56, 1.00],
619 [0.93, 0.46, 0.00], 820 [0.93, 0.46, 0.00],
620 [0.18, 0.54, 0.34], 821 [0.18, 0.54, 0.34],
621 [0.56, 0.73, 0.56], 822 [0.56, 0.73, 0.56],
622 [0.80, 0.80, 0.80], 823 [0.80, 0.80, 0.80],
623 [0.75, 0.61, 0.20], 824 [0.75, 0.61, 0.20],
624 [0.99, 0.77, 0.26], 825 [0.99, 0.77, 0.26],
625 [0.74, 0.65, 0.41], 826 [0.74, 0.65, 0.41],
626 ); 827);
627 828
829sub msg {
830 my ($self, $color, $type, $text, @extra) = @_;
831
832 $text = sanitise_xml $text;
833
834 if (my $cb = $self->{cb_msg}{$type}) {
835 $_->($self, $color, $type, $text, @extra) for values %$cb;
836 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
837 $type =~ s/-/_/g;
838 $self->{$type} = $text;
839 } else {
628 $self->logprint ("info: ", $text); 840 $self->logprint ("msg: ", $text);
841 return if $color < 0; # negative color == ignore if not understood
629 842
843 my $fg = $CF_COLOR[$color % @CF_COLOR];
844
630 # try to create single paragraphs of multiple lines sent by the server 845 ## try to create single paragraphs of multiple lines sent by the server
846 # no longer neecssary with TRT servers
631 $text =~ s/(?<=\S)\n(?=\w)/ /g; 847 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
632 848
633 $text = CFPlus::asxml $text;
634 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
635 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
636
637 ::message ({ fg => $color[$color], markup => $_ }) 849 ::message ({ fg => $fg, markup => $_ })
638 for split /\n/, $text; 850 for split /\n/, $text;
639 851
640 $self->{statusbox}->add ($text, 852 $self->{statusbox}->add ($text,
641 group => $text, 853 group => $text,
642 fg => $color[$color], 854 fg => $fg,
643 timeout => $color >= 2 ? 180 : 10, 855 timeout => $color >= 2 ? 180 : 10,
644 tooltip_font => $::FONT_FIXED, 856 tooltip_font => $::FONT_FIXED,
645 ); 857 );
646} 858 }
647
648sub drawextinfo {
649 my ($self, $color, $type, $subtype, $message) = @_;
650
651 $self->drawinfo ($color, $message);
652} 859}
653 860
654sub spell_add { 861sub spell_add {
655 my ($self, $spell) = @_; 862 my ($self, $spell) = @_;
656 863
… …
672} 879}
673 880
674sub setup { 881sub setup {
675 my ($self, $setup) = @_; 882 my ($self, $setup) = @_;
676 883
884 $self->{map_widget}->set_tilesize ($self->{tilesize});
677 $::MAP->resize ($self->{mapw}, $self->{maph}); 885 $::MAP->resize ($self->{mapw}, $self->{maph});
678} 886}
679 887
680sub addme_success { 888sub addme_success {
681 my ($self) = @_; 889 my ($self) = @_;
… …
888 $::SERVER_INFO->set_markup ( 1096 $::SERVER_INFO->set_markup (
889 "server <tt>$self->{host}:$self->{port}</tt>\n" 1097 "server <tt>$self->{host}:$self->{port}</tt>\n"
890 . "protocol version <tt>$self->{version}</tt>\n" 1098 . "protocol version <tt>$self->{version}</tt>\n"
891 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1099 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
892 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1100 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1101 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
893 . "editing support $yesno[!!$self->{editor_support}]\n" 1102 . "editing support $yesno[!!$self->{editor_support}]\n"
894 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1103 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1104 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
895 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1105 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
896 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1106 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
897 . "map size $self->{mapw}×$self->{maph}\n" 1107 . "map size $self->{mapw}×$self->{maph}\n"
898 ); 1108 );
899 1109
… …
921 1131
922 $self->update_server_info; 1132 $self->update_server_info;
923 1133
924 $self->send_command ("output-sync $::CFG->{output_sync}"); 1134 $self->send_command ("output-sync $::CFG->{output_sync}");
925 $self->send_command ("output-count $::CFG->{output_count}"); 1135 $self->send_command ("output-count $::CFG->{output_count}");
1136 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
926 $self->send_command ("pickup $::CFG->{pickup}"); 1137 $self->send_command ("pickup $::CFG->{pickup}");
927} 1138}
928 1139
929sub buildat { 1140sub buildat {
930 my ($self, $builditem, $x, $y) = @_; 1141 my ($self, $builditem, $x, $y) = @_;
… …
961 1172
962 (delete $self->{npc_dialog})->destroy 1173 (delete $self->{npc_dialog})->destroy
963 if $self->{npc_dialog}; 1174 if $self->{npc_dialog};
964 1175
965 $self->SUPER::destroy; 1176 $self->SUPER::destroy;
1177
1178 %$self = ();
966} 1179}
967 1180
968package CFPlus::NPCDialog; 1181package CFPlus::NPCDialog;
969 1182
970our @ISA = 'CFPlus::UI::Toplevel'; 1183our @ISA = 'CFPlus::UI::Toplevel';
… …
982 kw => { hi => 0, yes => 0, no => 0 }, 1195 kw => { hi => 0, yes => 0, no => 0 },
983 has_close_button => 1, 1196 has_close_button => 1,
984 @_, 1197 @_,
985 ); 1198 );
986 1199
987 Scalar::Util::weaken (my $this = $self); 1200 CFPlus::weaken (my $this = $self);
988 1201
989 $self->connect (delete => sub { $this->destroy; 1 }); 1202 $self->connect (delete => sub { $this->destroy; 1 });
990 1203
991 # better use a pane... 1204 # better use a pane...
992 $self->add (my $hbox = new CFPlus::UI::HBox); 1205 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1036}; 1249};
1037 1250
1038sub update_options { 1251sub update_options {
1039 my ($self) = @_; 1252 my ($self) = @_;
1040 1253
1041 Scalar::Util::weaken $self; 1254 CFPlus::weaken $self;
1042 1255
1043 $self->{options}->clear; 1256 $self->{options}->clear;
1044 $self->{options}->add ($self->{bye_button}); 1257 $self->{options}->add ($self->{bye_button});
1045 1258
1046 for my $kw (sort keys %{ $self->{kw} }) { 1259 for my $kw (sort keys %{ $self->{kw} }) {
… …
1055} 1268}
1056 1269
1057sub feed { 1270sub feed {
1058 my ($self, $msg) = @_; 1271 my ($self, $msg) = @_;
1059 1272
1060 Scalar::Util::weaken $self; 1273 CFPlus::weaken $self;
1061 1274
1062 if ($msg->{msgtype} eq "reply") { 1275 if ($msg->{msgtype} eq "reply") {
1063 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1276 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1064 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1277 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1065 1278
1066 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1279 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1067 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1280 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1068 my @link; 1281 my @link;
1069 $text =~ s{ 1282 $text =~ s{
1070 ($match) 1283 ($match)
1071 }{ 1284 }{

Diff Legend

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