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

Diff Legend

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