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.77 by root, Mon Aug 14 04:15:04 2006 UTC vs.
Revision 1.123 by root, Thu Jul 19 16:44:14 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
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 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 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev->{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 });
106
107 $self->connect_ext (event_capabilities => sub {
108 my ($cap) = @_;
109
110 if (my $ts = $cap->{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]);
115
116 my $w = int $self->{mapw} * 32 / $self->{tilesize};
117 my $h = int $self->{maph} * 32 / $self->{tilesize};
118
119 $self->setup_req (mapsize => "${w}x${h}");
120 }
121 }
122 });
123
124 $self->{json_coder}
125 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub {
127 $self->{widget}{$_[0]}
128 });
129
130 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_;
133
134 $self->{widgetset}{$arg{id}} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_;
142
143 my $ws = delete $self->{widgetset}{$arg{id}}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset destroy
151 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_;
153
154 my $args = $arg->{args} || {};
155
156 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub {
158 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
160
161 1
162 };
163 }
164
165 if (my $widget = eval {
166 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new (
168 %$args,
169 s_ws => $arg->{ws},
170 s_id => $arg->{id},
171 )
172 }
173 ) {
174 $self->{widget}{$arg->{id}}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176 = $widget;
177
178 $widget->connect (on_destroy => sub {
179 my ($widget) = @_;
180
181 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 });
184 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
187 }
188 });
189
190 # widget call
191 $self->connect_ext (w_c => sub {
192 my ($arg) = @_;
193
194 my $w = $self->{widget}{$arg->{id}}
195 or return;
196 my $m = $arg->{name};
197
198 my $a = $arg->{args} || [];
199
200 if (exists $arg->{rid}) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
202 } else {
203 $w->$m (@$a);
204 }
205 });
206
207 # widget set
208 $self->connect_ext (w_s => sub {
209 my ($arg) = @_;
210
211 my $w = $self->{widget}{$arg->{id}}
212 or return;
213
214 $w->{$arg->{name}} = $arg->{value};
215 });
216
217 # widget get
218 $self->connect_ext (w_g => sub {
219 my ($arg) = @_;
220
221 my $w = $self->{widget}{$arg->{id}}
222 or return;
223
224 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
225 });
226
227 # destroy widgets on logout
228 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
229 for my $ws (values %{delete $self->{widgetset} || {}}) {
230 $_->destroy
231 for values %{delete $ws->{w} || {}};
232 }
233 });
234
41 $self->{map_widget}->add_command (@$_) 235 $self->{map_widget}->add_command (@$_)
42 for @cmd_help; 236 for @cmd_help;
43 237
238 {
239 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
240 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
241 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
242 }
243
244 {
44 $self->{noface} = new_from_file CFPlus::Texture 245 $self->{noface} = my $tex = new_from_file CFPlus::Texture
45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 246 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
247 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
248 }
46 249
47 $self->{open_container} = 0; 250 $self->{open_container} = 0;
48 251
49 # "global"
50 $self->{tilecache} = CFPlus::db_table "tilecache";
51 $self->{facemap} = CFPlus::db_table "facemap";
52
53 # per server 252 # per server
54 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 253 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
55 254
56 $self 255 $self
57} 256}
58 257
59sub logprint { 258sub logprint {
… …
216 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 415 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
217 $::GAUGES->{food} ->set_value ($fo, $fo_m); 416 $::GAUGES->{food} ->set_value ($fo, $fo_m);
218 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 417 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
219 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 418 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
220 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 419 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
221 my $rng = $stats->{+CS_STAT_RANGE}; 420 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
222 $rng =~ s/^Range: //; # thank you so much dear server
223 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
224 my $title = $stats->{+CS_STAT_TITLE}; 421 my $title = $stats->{+CS_STAT_TITLE};
225 $title =~ s/^Player: //; 422 $title =~ s/^Player: //;
226 $::STATWIDS->{title} ->set_text ("Title: " . $title); 423 $::STATWIDS->{title} ->set_text ("Title: " . $title);
227 424
228 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 425 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
277 if ($ev->{button} == 1) { 474 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 475 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 476 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 477 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 478 } elsif ($ev->{button} == 3) {
479 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 480 (new CFPlus::UI::Menu
283 items => [ 481 items => [
284 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 482 ["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"]) }], 483 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
286 ], 484 ],
287 )->popup ($ev); 485 )->popup ($ev);
288 } else { 486 } else {
289 return 0; 487 return 0;
290 } 488 }
… …
307 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 505 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
308 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 506 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
309 } 507 }
310} 508}
311 509
510sub macro_send {
511 my ($self, $macro) = @_;
512
513 for my $cmd (@{ $macro->{action} }) {
514 $self->send_command ($cmd);
515 }
516}
517
312sub user_send { 518sub user_send {
313 my ($self, $command) = @_; 519 my ($self, $command) = @_;
314 520
521 $self->{record}->($command)
315 if ($self->{record}) { 522 if $self->{record};
316 push @{$self->{record}}, $command;
317 }
318 523
319 $self->logprint ("send: ", $command); 524 $self->logprint ("send: ", $command);
320 $self->send_command ($command); 525 $self->send_command ($command);
321 ::status ($command); 526 ::status ($command);
322} 527}
323 528
324sub start_record { 529sub record {
325 my ($self) = @_; 530 my ($self, $cb) = @_;
326 531
327 $self->{record} = []; 532 $self->{record} = $cb;
328}
329
330sub stop_record {
331 my ($self) = @_;
332 return delete $self->{record};
333} 533}
334 534
335sub map_scroll { 535sub map_scroll {
336 my ($self, $dx, $dy) = @_; 536 my ($self, $dx, $dy) = @_;
337 537
… …
339} 539}
340 540
341sub feed_map1a { 541sub feed_map1a {
342 my ($self, $data) = @_; 542 my ($self, $data) = @_;
343 543
344 $self->{map}->map1a_update ($data); 544 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
345 $self->{map_widget}->update; 545 $self->{map_widget}->update;
346} 546}
347 547
348sub magicmap { 548sub magicmap {
349 my ($self, $w, $h, $x, $y, $data) = @_; 549 my ($self, $w, $h, $x, $y, $data) = @_;
… …
358 or return; 558 or return;
359 559
360 my ($hash, $x, $y, $w, $h) = @$map_info; 560 my ($hash, $x, $y, $w, $h) = @$map_info;
361 561
362 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 562 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
363 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 563 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
364 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 564 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
365} 565}
366 566
367sub map_clear { 567sub map_clear {
368 my ($self) = @_; 568 my ($self) = @_;
… …
372 572
373 $self->{map}->clear; 573 $self->{map}->clear;
374 delete $self->{map_widget}{magicmap}; 574 delete $self->{map_widget}{magicmap};
375} 575}
376 576
577sub bg_fetch {
578 my ($self) = @_;
579
580 my $id;
581
582 do {
583 $id = pop @{$self->{bg_fetch}}
584 or return;
585 } while $self->{texture}[$id];
586
587 CFPlus::DB::get tilecache => $id, sub {
588 my ($data) = @_;
589
590 return unless $self->{map}; # stop when destroyed
591
592 $self->set_texture ($id => $data)
593 if defined $data;
594
595 $self->bg_fetch;
596 };
597}
377 598
378sub load_map($$$) { 599sub load_map($$$) {
379 my ($self, $hash, $x, $y) = @_; 600 my ($self, $hash, $x, $y) = @_;
380 601
381 if (defined (my $data = $self->{mapcache}->get ($hash))) { 602 my $gen = $self->{map_change_gen};
603
604 CFPlus::DB::get $self->{mapcache} => $hash, sub {
605 return unless $gen == $self->{map_change_gen};
606
607 my ($data) = @_;
608
609 if (defined $data) {
382 $data = Compress::LZF::decompress $data; 610 $data = Compress::LZF::decompress $data;
383 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 611 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
384 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
385 my $data = $self->{tilecache}->get ($id)
386 or next;
387 612
388 $self->set_texture ($id => $data); 613 my $inprogress = @{ $self->{bg_fetch} || [] };
614 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
615 $self->bg_fetch unless $inprogress;
389 } 616 }
390 } 617 };
391} 618}
392 619
393# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 620# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
394# (server resource,s latency, bandwidth), so this hack is warranted. 621# (server resource,s latency, bandwidth), so this hack is warranted.
395# the right fix is to make real tiled maps with an overview file 622# the right fix is to make real tiled maps with an overview file
… …
459 686
460 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 687 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
461 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 688 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
462 689
463 } else { 690 } else {
691 my $gen = $self->{map_change_gen};
464 $self->send_mapinfo ("spatial $path$tile", sub { 692 $self->send_mapinfo ("spatial $path$tile", sub {
693 return unless $gen == $self->{map_change_gen};
694
465 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 695 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
466 696
467 return if $mode ne "spatial"; 697 return if $mode ne "spatial";
468 698
469 $x += $self->{map}->ox; 699 $x += $self->{map}->ox;
… …
483 713
484sub map_change { 714sub map_change {
485 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 715 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
486 716
487 $self->flush_map; 717 $self->flush_map;
718
719 ++$self->{map_change_gen};
488 720
489 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 721 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
490 722
491 my $mapmapw = $self->{mapmap}->{w}; 723 my $mapmapw = $self->{mapmap}->{w};
492 my $mapmaph = $self->{mapmap}->{h}; 724 my $mapmaph = $self->{mapmap}->{h};
… …
509 $self->load_map ($hash, $x, $y); 741 $self->load_map ($hash, $x, $y);
510 $self->flood_fill (0, 0, 0, "", $hash, $flags); 742 $self->flood_fill (0, 0, 0, "", $hash, $flags);
511} 743}
512 744
513sub face_find { 745sub face_find {
514 my ($self, $facenum, $face) = @_; 746 my ($self, $facenum, $face, $cb) = @_;
515 747
516 my $hash = "$face->{chksum},$face->{name}"; 748 my $hash = "$face->{chksum},$face->{name}";
517 749
518 my $id = $self->{facemap}->get ($hash); 750 my $id = CFPlus::DB::get_tile_id_sync $hash;
519 751
520 unless ($id) {
521 # create new id for face
522 # I love transactions
523 for (1..100) {
524 my $txn = $CFPlus::DB_ENV->txn_begin;
525 my $status = $self->{facemap}->db_get (id => $id);
526 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
527 $id = ($id || 64) + 1;
528 if ($self->{facemap}->put (id => $id) == 0
529 && $self->{facemap}->put ($hash => $id) == 0) {
530 $txn->txn_commit;
531
532 goto gotid;
533 }
534 }
535 $txn->txn_abort;
536 }
537
538 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
539 }
540
541gotid:
542 $face->{id} = $id; 752 $face->{id} = $id;
543 $self->{map}->set_face ($facenum => $id);
544 $self->{faceid}[$facenum] = $id;#d# 753 $self->{faceid}[$facenum] = $id;
545 754
546 my $face = $self->{tilecache}->get ($id); 755 $self->{map}->set_tileid ($facenum => $id);
547 756
548 if ($face) { 757 CFPlus::DB::get tilecache => $id, $cb;
549 #$self->face_prefetch;
550 $face
551 } else {
552 my $tex = $self->{noface};
553 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
554 undef
555 };
556} 758}
557 759
558sub face_update { 760sub face_update {
559 my ($self, $facenum, $face, $changed) = @_; 761 my ($self, $facenum, $face, $changed) = @_;
560 762
561 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 763 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
764 if $changed;
562 765
563 $self->set_texture ($face->{id} => delete $face->{image}); 766 $self->set_texture ($face->{id} => delete $face->{image});
767}
768
769sub smooth_update {
770 my ($self, $facenum, $face) = @_;
771
772 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
564} 773}
565 774
566sub set_texture { 775sub set_texture {
567 my ($self, $id, $data) = @_; 776 my ($self, $id, $data) = @_;
568 777
778 return unless $self->{map};
779
569 $self->{texture}[$id] ||= do { 780 $self->{texture}[$id] = my $tex =
570 my $tex =
571 new_from_image CFPlus::Texture 781 new_from_image CFPlus::Texture
572 $data, minify => 1, mipmap => 1; 782 $data, minify => 1, mipmap => 1;
573 783
574 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 784 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
575 $self->{map_widget}->update; 785 $self->{map_widget}->update;
576 786
577 $tex 787 $_->() for @{(delete $self->{face_cb}{$id}) || []};
788}
789
790sub connect_face_update {
791 my ($self, $id, $cb) = @_;
792
793 push @{$self->{face_cb}{$id}}, $cb;
794
795 CFPlus::guard {
796 @{$self->{face_cb}{$id}}
797 = grep $_ != $cb,
798 @{$self->{face_cb}{$id}};
578 }; 799 }
579} 800}
580 801
581sub sound_play { 802sub sound_play {
582 my ($self, $x, $y, $soundnum, $type) = @_; 803 my ($self, $x, $y, $soundnum, $type) = @_;
583 804
… …
593 $LAST_QUERY = $prompt; 814 $LAST_QUERY = $prompt;
594 815
595 $self->{query}-> ($self, $flags, $prompt); 816 $self->{query}-> ($self, $flags, $prompt);
596} 817}
597 818
598sub drawinfo { 819sub sanitise_xml($) {
599 my ($self, $color, $text) = @_; 820 local $_ = shift;
600 821
601 my @color = ( 822 # we now weed out all tags we do not support
823 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
824 # now all entities
825 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
826
827 # handle some elements
828 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
829 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
830
831 $_
832}
833
834our %NAME_TO_COLOR = (
835 black => 0,
836 white => 1,
837 darkblue => 2,
838 red => 3,
839 orange => 4,
840 lightblue => 5,
841 darkorange => 6,
842 green => 7,
843 darkgreen => 8,
844 grey => 9,
845 brown => 10,
846 yellow => 11,
847 tan => 12,
848);
849
850our @CF_COLOR = (
602 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 851 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
603 [1.00, 1.00, 1.00], 852 [1.00, 1.00, 1.00],
604 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 853 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
605 [1.00, 0.00, 0.00], 854 [1.00, 0.00, 0.00],
606 [1.00, 0.54, 0.00], 855 [1.00, 0.54, 0.00],
607 [0.11, 0.56, 1.00], 856 [0.11, 0.56, 1.00],
608 [0.93, 0.46, 0.00], 857 [0.93, 0.46, 0.00],
609 [0.18, 0.54, 0.34], 858 [0.18, 0.54, 0.34],
610 [0.56, 0.73, 0.56], 859 [0.56, 0.73, 0.56],
611 [0.80, 0.80, 0.80], 860 [0.80, 0.80, 0.80],
612 [0.75, 0.61, 0.20], 861 [0.75, 0.61, 0.20],
613 [0.99, 0.77, 0.26], 862 [0.99, 0.77, 0.26],
614 [0.74, 0.65, 0.41], 863 [0.74, 0.65, 0.41],
615 ); 864);
616 865
866sub msg {
867 my ($self, $color, $type, $text, @extra) = @_;
868
869 $text = sanitise_xml $text;
870
871 if (my $cb = $self->{cb_msg}{$type}) {
872 $_->($self, $color, $type, $text, @extra) for values %$cb;
873 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
874 $type =~ s/-/_/g;
875 $self->{$type} = $text;
876 } else {
617 $self->logprint ("info: ", $text); 877 $self->logprint ("msg: ", $text);
878 return if $color < 0; # negative color == ignore if not understood
618 879
619 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 880 my $fg = $CF_COLOR[$color % @CF_COLOR];
620 881
621 # try to create single paragraphs of multiple lines sent by the server 882 ## try to create single paragraphs of multiple lines sent by the server
883 # no longer neecssary with TRT servers
622 $text =~ s/(?<=\S)\n(?=\w)/ /g; 884 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
623 885
624 $text = CFPlus::asxml $text; 886 ::message ({ fg => $fg, markup => $_ })
625 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 887 for split /\n/, $text;
626 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
627 888
628 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
629 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
630 $self->{logview}->scroll_to_bottom;
631
632 $self->{statusbox}->add ($text, 889 $self->{statusbox}->add ($text,
633 group => $text, 890 group => $text,
634 fg => $color[$color], 891 fg => $fg,
635 timeout => $color >= 2 ? 180 : 10, 892 timeout => $color >= 2 ? 180 : 10,
636 tooltip_font => $::FONT_FIXED, 893 tooltip_font => $::FONT_FIXED,
637 ); 894 );
638} 895 }
639
640sub drawextinfo {
641 my ($self, $color, $type, $subtype, $message) = @_;
642
643 $self->drawinfo ($color, $message);
644} 896}
645 897
646sub spell_add { 898sub spell_add {
647 my ($self, $spell) = @_; 899 my ($self, $spell) = @_;
648 900
649 # try to create single paragraphs out of the multiple lines sent by the server 901 # try to create single paragraphs out of the multiple lines sent by the server
650 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 902 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
651 $spell->{message} =~ s/\n+$//; 903 $spell->{message} =~ s/\n+$//;
652 $spell->{message} ||= "Server did not provide a description for this spell."; 904 $spell->{message} ||= "Server did not provide a description for this spell.";
653 905
654 $::SPELL_PAGE->add_spell ($spell); 906 $::SPELL_LIST->add_spell ($spell);
655 907
656 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 908 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
657 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 909 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
658} 910}
659 911
660sub spell_delete { 912sub spell_delete {
661 my ($self, $spell) = @_; 913 my ($self, $spell) = @_;
662 914
663 $::SPELL_PAGE->remove_spell ($spell); 915 $::SPELL_LIST->remove_spell ($spell);
916}
917
918sub setup {
919 my ($self, $setup) = @_;
920
921 $self->{map_widget}->set_tilesize ($self->{tilesize});
922 $::MAP->resize ($self->{mapw}, $self->{maph});
664} 923}
665 924
666sub addme_success { 925sub addme_success {
667 my ($self) = @_; 926 my ($self) = @_;
668 927
… …
874 $::SERVER_INFO->set_markup ( 1133 $::SERVER_INFO->set_markup (
875 "server <tt>$self->{host}:$self->{port}</tt>\n" 1134 "server <tt>$self->{host}:$self->{port}</tt>\n"
876 . "protocol version <tt>$self->{version}</tt>\n" 1135 . "protocol version <tt>$self->{version}</tt>\n"
877 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1136 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
878 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1137 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1138 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1139 . "editing support $yesno[!!$self->{editor_support}]\n"
1140 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1141 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
879 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1142 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
880 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1143 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
881 . "map size $self->{mapw}×$self->{maph}\n" 1144 . "map size $self->{mapw}×$self->{maph}\n"
882 ); 1145 );
1146
1147 ::setup_build_button ($self->{editor_support}->{builder_ui});
883} 1148}
884 1149
885sub logged_in { 1150sub logged_in {
886 my ($self) = @_; 1151 my ($self) = @_;
887 1152
888 $self->send_ext_req (cfplus_support => version => 1, sub { 1153 $self->send_ext_req (cfplus_support => version => 1, sub {
889 $self->{cfplus_ext} = $_[0]{version}; 1154 $self->{cfplus_ext} = $_[0]{version};
890 $self->update_server_info; 1155 $self->update_server_info;
891 1156
1157 if ($self->{cfplus_ext} >= 2) {
1158 $self->send_ext_req ("editor_support", sub {
1159 $self->{editor_support} = $_[0];
1160 $self->update_server_info;
1161
1162 0
1163 });
1164 }
1165
892 0 1166 0
893 }); 1167 });
894 1168
895 $self->update_server_info; 1169 $self->update_server_info;
896 1170
897 $self->send_command ("output-sync $::CFG->{output_sync}"); 1171 $self->send_command ("output-sync $::CFG->{output_sync}");
898 $self->send_command ("output-count $::CFG->{output_count}"); 1172 $self->send_command ("output-count $::CFG->{output_count}");
1173 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
899 $self->send_command ("pickup $::CFG->{pickup}"); 1174 $self->send_command ("pickup $::CFG->{pickup}");
1175}
1176
1177sub buildat {
1178 my ($self, $builditem, $x, $y) = @_;
1179
1180 if ($self->{cfplus_ext}) {
1181 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1182 }
900} 1183}
901 1184
902sub lookat { 1185sub lookat {
903 my ($self, $x, $y) = @_; 1186 my ($self, $x, $y) = @_;
904 1187
… …
922} 1205}
923 1206
924sub destroy { 1207sub destroy {
925 my ($self) = @_; 1208 my ($self) = @_;
926 1209
927 $self->{npc_dialog}->destroy 1210 (delete $self->{npc_dialog})->destroy
928 if $self->{npc_dialog}; 1211 if $self->{npc_dialog};
929 1212
930 $self->SUPER::destroy; 1213 $self->SUPER::destroy;
1214
1215 %$self = ();
931} 1216}
932 1217
933package CFPlus::NPCDialog; 1218package CFPlus::NPCDialog;
934 1219
935our @ISA = 'CFPlus::UI::Toplevel'; 1220our @ISA = 'CFPlus::UI::Toplevel';
… …
947 kw => { hi => 0, yes => 0, no => 0 }, 1232 kw => { hi => 0, yes => 0, no => 0 },
948 has_close_button => 1, 1233 has_close_button => 1,
949 @_, 1234 @_,
950 ); 1235 );
951 1236
952 Scalar::Util::weaken (my $this = $self); 1237 CFPlus::weaken (my $this = $self);
953 1238
954 $self->connect (delete => sub { $this->destroy; 1 }); 1239 $self->connect (delete => sub { $this->destroy; 1 });
955 1240
956 # better use a pane... 1241 # better use a pane...
957 $self->add (my $hbox = new CFPlus::UI::HBox); 1242 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1001}; 1286};
1002 1287
1003sub update_options { 1288sub update_options {
1004 my ($self) = @_; 1289 my ($self) = @_;
1005 1290
1006 Scalar::Util::weaken $self; 1291 CFPlus::weaken $self;
1007 1292
1008 $self->{options}->clear; 1293 $self->{options}->clear;
1009 $self->{options}->add ($self->{bye_button}); 1294 $self->{options}->add ($self->{bye_button});
1010 1295
1011 for my $kw (sort keys %{ $self->{kw} }) { 1296 for my $kw (sort keys %{ $self->{kw} }) {
… …
1020} 1305}
1021 1306
1022sub feed { 1307sub feed {
1023 my ($self, $msg) = @_; 1308 my ($self, $msg) = @_;
1024 1309
1025 Scalar::Util::weaken $self; 1310 CFPlus::weaken $self;
1026 1311
1027 if ($msg->{msgtype} eq "reply") { 1312 if ($msg->{msgtype} eq "reply") {
1028 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1313 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1029 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1314 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1030 1315
1031 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1316 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1032 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1317 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1033 my @link; 1318 my @link;
1034 $text =~ s{ 1319 $text =~ s{
1035 ($match) 1320 ($match)
1036 }{ 1321 }{
… …
1081 1366
1082 $self->SUPER::destroy; 1367 $self->SUPER::destroy;
1083} 1368}
1084 1369
10851 13701
1371

Diff Legend

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