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.86 by root, Sun Oct 8 21:22:30 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;
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 => 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 );
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 (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
41 $self->{map_widget}->add_command (@$_) 214 $self->{map_widget}->add_command (@$_)
42 for @cmd_help; 215 for @cmd_help;
43
44 $self->{noface} = new_from_file CFPlus::Texture
45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
46 216
47 { 217 {
48 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 218 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
49 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 219 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
50 $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}});
51 } 221 }
52 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
53 $self->{open_container} = 0; 229 $self->{open_container} = 0;
54 230
55 # "global"
56 $self->{tilecache} = CFPlus::db_table "tilecache"
57 or die "tilecache: unable to open database table";
58 $self->{facemap} = CFPlus::db_table "facemap"
59 or die "facemap: unable to open database table";
60
61 # per server 231 # per server
62 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 232 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
63 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
64 233
65 $self 234 $self
66} 235}
67 236
68sub logprint { 237sub logprint {
… …
225 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 394 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
226 $::GAUGES->{food} ->set_value ($fo, $fo_m); 395 $::GAUGES->{food} ->set_value ($fo, $fo_m);
227 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 396 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
228 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 397 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
229 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 398 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
230 my $rng = $stats->{+CS_STAT_RANGE}; 399 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
231 $rng =~ s/^Range: //; # thank you so much dear server
232 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
233 my $title = $stats->{+CS_STAT_TITLE}; 400 my $title = $stats->{+CS_STAT_TITLE};
234 $title =~ s/^Player: //; 401 $title =~ s/^Player: //;
235 $::STATWIDS->{title} ->set_text ("Title: " . $title); 402 $::STATWIDS->{title} ->set_text ("Title: " . $title);
236 403
237 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 404 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
286 if ($ev->{button} == 1) { 453 if ($ev->{button} == 1) {
287 $::CONN->user_send ("ready_skill $name"); 454 $::CONN->user_send ("ready_skill $name");
288 } elsif ($ev->{button} == 2) { 455 } elsif ($ev->{button} == 2) {
289 $::CONN->user_send ("use_skill $name"); 456 $::CONN->user_send ("use_skill $name");
290 } elsif ($ev->{button} == 3) { 457 } elsif ($ev->{button} == 3) {
458 my $shortname = CFPlus::shorten $name, 14;
291 (new CFPlus::UI::Menu 459 (new CFPlus::UI::Menu
292 items => [ 460 items => [
293 ["bind <i>ready_skill $name</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"] }],
294 ["bind <i>use_skill $name</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"] }],
295 ], 463 ],
296 )->popup ($ev); 464 )->popup ($ev);
297 } else { 465 } else {
298 return 0; 466 return 0;
299 } 467 }
… …
316 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 484 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
317 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 485 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
318 } 486 }
319} 487}
320 488
489sub macro_send {
490 my ($self, $macro) = @_;
491
492 for my $cmd (@{ $macro->{action} }) {
493 $self->send_command ($cmd);
494 }
495}
496
321sub user_send { 497sub user_send {
322 my ($self, $command) = @_; 498 my ($self, $command) = @_;
323 499
500 $self->{record}->($command)
324 if ($self->{record}) { 501 if $self->{record};
325 push @{$self->{record}}, $command;
326 }
327 502
328 $self->logprint ("send: ", $command); 503 $self->logprint ("send: ", $command);
329 $self->send_command ($command); 504 $self->send_command ($command);
330 ::status ($command); 505 ::status ($command);
331} 506}
332 507
333sub start_record { 508sub record {
334 my ($self) = @_; 509 my ($self, $cb) = @_;
335 510
336 $self->{record} = []; 511 $self->{record} = $cb;
337}
338
339sub stop_record {
340 my ($self) = @_;
341 return delete $self->{record};
342} 512}
343 513
344sub map_scroll { 514sub map_scroll {
345 my ($self, $dx, $dy) = @_; 515 my ($self, $dx, $dy) = @_;
346 516
… …
367 or return; 537 or return;
368 538
369 my ($hash, $x, $y, $w, $h) = @$map_info; 539 my ($hash, $x, $y, $w, $h) = @$map_info;
370 540
371 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 541 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
372 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 542 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
373 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 543 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
374} 544}
375 545
376sub map_clear { 546sub map_clear {
377 my ($self) = @_; 547 my ($self) = @_;
… …
381 551
382 $self->{map}->clear; 552 $self->{map}->clear;
383 delete $self->{map_widget}{magicmap}; 553 delete $self->{map_widget}{magicmap};
384} 554}
385 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}
386 577
387sub load_map($$$) { 578sub load_map($$$) {
388 my ($self, $hash, $x, $y) = @_; 579 my ($self, $hash, $x, $y) = @_;
389 580
390 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) {
391 $data = Compress::LZF::decompress $data; 589 $data = Compress::LZF::decompress $data;
392 #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#
393 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
394 my $data = $self->{tilecache}->get ($id)
395 or next;
396 591
397 $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;
398 } 595 }
399 } 596 };
400} 597}
401 598
402# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 599# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
403# (server resource,s latency, bandwidth), so this hack is warranted. 600# (server resource,s latency, bandwidth), so this hack is warranted.
404# 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
… …
468 665
469 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 666 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
470 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 667 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
471 668
472 } else { 669 } else {
670 my $gen = $self->{map_change_gen};
473 $self->send_mapinfo ("spatial $path$tile", sub { 671 $self->send_mapinfo ("spatial $path$tile", sub {
672 return unless $gen == $self->{map_change_gen};
673
474 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 674 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
475 675
476 return if $mode ne "spatial"; 676 return if $mode ne "spatial";
477 677
478 $x += $self->{map}->ox; 678 $x += $self->{map}->ox;
… …
492 692
493sub map_change { 693sub map_change {
494 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 694 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
495 695
496 $self->flush_map; 696 $self->flush_map;
697
698 ++$self->{map_change_gen};
497 699
498 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 700 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
499 701
500 my $mapmapw = $self->{mapmap}->{w}; 702 my $mapmapw = $self->{mapmap}->{w};
501 my $mapmaph = $self->{mapmap}->{h}; 703 my $mapmaph = $self->{mapmap}->{h};
… …
518 $self->load_map ($hash, $x, $y); 720 $self->load_map ($hash, $x, $y);
519 $self->flood_fill (0, 0, 0, "", $hash, $flags); 721 $self->flood_fill (0, 0, 0, "", $hash, $flags);
520} 722}
521 723
522sub face_find { 724sub face_find {
523 my ($self, $facenum, $face) = @_; 725 my ($self, $facenum, $face, $cb) = @_;
524 726
525 my $hash = "$face->{chksum},$face->{name}"; 727 my $hash = "$face->{chksum},$face->{name}";
526 728
527 my $id = $self->{facemap}->get ($hash); 729 my $id = CFPlus::DB::get_tile_id_sync $hash;
528 730
529 unless ($id) {
530 # create new id for face
531 # I love transactions
532 for (1..100) {
533 my $txn = $CFPlus::DB_ENV->txn_begin;
534 my $status = $self->{facemap}->db_get (id => $id);
535 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
536 $id = ($id || 64) + 1;
537 if ($self->{facemap}->put (id => $id) == 0
538 && $self->{facemap}->put ($hash => $id) == 0) {
539 $txn->txn_commit;
540
541 goto gotid;
542 }
543 }
544 $txn->txn_abort;
545 }
546
547 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
548 }
549
550gotid:
551 $face->{id} = $id; 731 $face->{id} = $id;
552 $self->{map}->set_face ($facenum => $id);
553 $self->{faceid}[$facenum] = $id;#d# 732 $self->{faceid}[$facenum] = $id;
554 733
555 my $face = $self->{tilecache}->get ($id); 734 $self->{map}->set_tileid ($facenum => $id);
556 735
557 if ($face) { 736 CFPlus::DB::get tilecache => $id, $cb;
558 #$self->face_prefetch;
559 $face
560 } else {
561 my $tex = $self->{noface};
562 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
563 undef
564 };
565} 737}
566 738
567sub face_update { 739sub face_update {
568 my ($self, $facenum, $face, $changed) = @_; 740 my ($self, $facenum, $face, $changed) = @_;
569 741
570 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 742 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
743 if $changed;
571 744
572 $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});
573} 752}
574 753
575sub set_texture { 754sub set_texture {
576 my ($self, $id, $data) = @_; 755 my ($self, $id, $data) = @_;
577 756
578 $self->{texture}[$id] ||= do { 757 $self->{texture}[$id] = my $tex =
579 my $tex =
580 new_from_image CFPlus::Texture 758 new_from_image CFPlus::Texture
581 $data, minify => 1, mipmap => 1; 759 $data, minify => 1, mipmap => 1;
582 760
583 $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}});
584 $self->{map_widget}->update; 762 $self->{map_widget}->update;
585
586 $tex
587 };
588} 763}
589 764
590sub sound_play { 765sub sound_play {
591 my ($self, $x, $y, $soundnum, $type) = @_; 766 my ($self, $x, $y, $soundnum, $type) = @_;
592 767
… …
602 $LAST_QUERY = $prompt; 777 $LAST_QUERY = $prompt;
603 778
604 $self->{query}-> ($self, $flags, $prompt); 779 $self->{query}-> ($self, $flags, $prompt);
605} 780}
606 781
607sub drawinfo { 782sub sanitise_xml($) {
608 my ($self, $color, $text) = @_; 783 local $_ = shift;
609 784
610 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 = (
611 [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],
612 [1.00, 1.00, 1.00], 815 [1.00, 1.00, 1.00],
613 [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]
614 [1.00, 0.00, 0.00], 817 [1.00, 0.00, 0.00],
615 [1.00, 0.54, 0.00], 818 [1.00, 0.54, 0.00],
616 [0.11, 0.56, 1.00], 819 [0.11, 0.56, 1.00],
617 [0.93, 0.46, 0.00], 820 [0.93, 0.46, 0.00],
618 [0.18, 0.54, 0.34], 821 [0.18, 0.54, 0.34],
619 [0.56, 0.73, 0.56], 822 [0.56, 0.73, 0.56],
620 [0.80, 0.80, 0.80], 823 [0.80, 0.80, 0.80],
621 [0.75, 0.61, 0.20], 824 [0.75, 0.61, 0.20],
622 [0.99, 0.77, 0.26], 825 [0.99, 0.77, 0.26],
623 [0.74, 0.65, 0.41], 826 [0.74, 0.65, 0.41],
624 ); 827);
625 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 {
626 $self->logprint ("info: ", $text); 840 $self->logprint ("msg: ", $text);
841 return if $color < 0; # negative color == ignore if not understood
627 842
843 my $fg = $CF_COLOR[$color % @CF_COLOR];
844
628 # 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
629 $text =~ s/(?<=\S)\n(?=\w)/ /g; 847 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
630 848
631 $text = CFPlus::asxml $text;
632 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
633 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
634
635 ::message ({ fg => $color[$color], markup => $_ }) 849 ::message ({ fg => $fg, markup => $_ })
636 for split /\n/, $text; 850 for split /\n/, $text;
637 851
638 $self->{statusbox}->add ($text, 852 $self->{statusbox}->add ($text,
639 group => $text, 853 group => $text,
640 fg => $color[$color], 854 fg => $fg,
641 timeout => $color >= 2 ? 180 : 10, 855 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 856 tooltip_font => $::FONT_FIXED,
643 ); 857 );
644} 858 }
645
646sub drawextinfo {
647 my ($self, $color, $type, $subtype, $message) = @_;
648
649 $self->drawinfo ($color, $message);
650} 859}
651 860
652sub spell_add { 861sub spell_add {
653 my ($self, $spell) = @_; 862 my ($self, $spell) = @_;
654 863
655 # try to create single paragraphs out of the multiple lines sent by the server 864 # try to create single paragraphs out of the multiple lines sent by the server
656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 865 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
657 $spell->{message} =~ s/\n+$//; 866 $spell->{message} =~ s/\n+$//;
658 $spell->{message} ||= "Server did not provide a description for this spell."; 867 $spell->{message} ||= "Server did not provide a description for this spell.";
659 868
660 $::SPELL_PAGE->add_spell ($spell); 869 $::SPELL_LIST->add_spell ($spell);
661 870
662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 871 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
663 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 872 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
664} 873}
665 874
666sub spell_delete { 875sub spell_delete {
667 my ($self, $spell) = @_; 876 my ($self, $spell) = @_;
668 877
669 $::SPELL_PAGE->remove_spell ($spell); 878 $::SPELL_LIST->remove_spell ($spell);
879}
880
881sub setup {
882 my ($self, $setup) = @_;
883
884 $self->{map_widget}->set_tilesize ($self->{tilesize});
885 $::MAP->resize ($self->{mapw}, $self->{maph});
670} 886}
671 887
672sub addme_success { 888sub addme_success {
673 my ($self) = @_; 889 my ($self) = @_;
674 890
… …
880 $::SERVER_INFO->set_markup ( 1096 $::SERVER_INFO->set_markup (
881 "server <tt>$self->{host}:$self->{port}</tt>\n" 1097 "server <tt>$self->{host}:$self->{port}</tt>\n"
882 . "protocol version <tt>$self->{version}</tt>\n" 1098 . "protocol version <tt>$self->{version}</tt>\n"
883 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1099 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
884 . "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"
885 . "editing support $yesno[!!$self->{editor_support}]\n" 1102 . "editing support $yesno[!!$self->{editor_support}]\n"
886 . "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"
887 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1105 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
888 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1106 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
889 . "map size $self->{mapw}×$self->{maph}\n" 1107 . "map size $self->{mapw}×$self->{maph}\n"
890 ); 1108 );
1109
1110 ::setup_build_button ($self->{editor_support}->{builder_ui});
891} 1111}
892 1112
893sub logged_in { 1113sub logged_in {
894 my ($self) = @_; 1114 my ($self) = @_;
895 1115
… …
911 1131
912 $self->update_server_info; 1132 $self->update_server_info;
913 1133
914 $self->send_command ("output-sync $::CFG->{output_sync}"); 1134 $self->send_command ("output-sync $::CFG->{output_sync}");
915 $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;
916 $self->send_command ("pickup $::CFG->{pickup}"); 1137 $self->send_command ("pickup $::CFG->{pickup}");
1138}
1139
1140sub buildat {
1141 my ($self, $builditem, $x, $y) = @_;
1142
1143 if ($self->{cfplus_ext}) {
1144 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1145 }
917} 1146}
918 1147
919sub lookat { 1148sub lookat {
920 my ($self, $x, $y) = @_; 1149 my ($self, $x, $y) = @_;
921 1150
… …
943 1172
944 (delete $self->{npc_dialog})->destroy 1173 (delete $self->{npc_dialog})->destroy
945 if $self->{npc_dialog}; 1174 if $self->{npc_dialog};
946 1175
947 $self->SUPER::destroy; 1176 $self->SUPER::destroy;
1177
1178 %$self = ();
948} 1179}
949 1180
950package CFPlus::NPCDialog; 1181package CFPlus::NPCDialog;
951 1182
952our @ISA = 'CFPlus::UI::Toplevel'; 1183our @ISA = 'CFPlus::UI::Toplevel';
… …
964 kw => { hi => 0, yes => 0, no => 0 }, 1195 kw => { hi => 0, yes => 0, no => 0 },
965 has_close_button => 1, 1196 has_close_button => 1,
966 @_, 1197 @_,
967 ); 1198 );
968 1199
969 Scalar::Util::weaken (my $this = $self); 1200 CFPlus::weaken (my $this = $self);
970 1201
971 $self->connect (delete => sub { $this->destroy; 1 }); 1202 $self->connect (delete => sub { $this->destroy; 1 });
972 1203
973 # better use a pane... 1204 # better use a pane...
974 $self->add (my $hbox = new CFPlus::UI::HBox); 1205 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1018}; 1249};
1019 1250
1020sub update_options { 1251sub update_options {
1021 my ($self) = @_; 1252 my ($self) = @_;
1022 1253
1023 Scalar::Util::weaken $self; 1254 CFPlus::weaken $self;
1024 1255
1025 $self->{options}->clear; 1256 $self->{options}->clear;
1026 $self->{options}->add ($self->{bye_button}); 1257 $self->{options}->add ($self->{bye_button});
1027 1258
1028 for my $kw (sort keys %{ $self->{kw} }) { 1259 for my $kw (sort keys %{ $self->{kw} }) {
… …
1037} 1268}
1038 1269
1039sub feed { 1270sub feed {
1040 my ($self, $msg) = @_; 1271 my ($self, $msg) = @_;
1041 1272
1042 Scalar::Util::weaken $self; 1273 CFPlus::weaken $self;
1043 1274
1044 if ($msg->{msgtype} eq "reply") { 1275 if ($msg->{msgtype} eq "reply") {
1045 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1276 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1046 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1277 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1047 1278
1048 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1279 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1049 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} };
1050 my @link; 1281 my @link;
1051 $text =~ s{ 1282 $text =~ s{
1052 ($match) 1283 ($match)
1053 }{ 1284 }{

Diff Legend

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