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.112 by root, Tue Jul 10 16:25:16 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_capabilities => sub {
54 my ($cap) = @_;
55
56 if (my $ts = $cap->{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]);
61
62 my $w = int $self->{mapw} * 32 / $self->{tilesize};
63 my $h = int $self->{maph} * 32 / $self->{tilesize};
64
65 $self->setup_req (mapsize => "${w}x${h}");
66 }
67 }
68 });
69
70 $self->{json_coder}
71 ->convert_blessed
72 ->filter_json_single_key_object (__widget_ref__ => sub {
73 $self->{widget}{$_[0]}
74 });
75
76 $self->connect_ext (ws_n => sub {
77 my ($arg) = @_;
78
79 $self->{widgetset}{$arg{id}} = {
80 w => {},
81 };
82 });
83
84 $self->connect_ext (ws_d => sub {
85 my ($arg) = @_;
86
87 my $ws = delete $self->{widgetset}{$arg{id}}
88 or return;
89
90 $_->destroy
91 for values %{$ws->{w}};
92 });
93
94 $self->connect_ext (ws_c => sub {
95 my ($arg) = @_;
96
97 my $args = $arg->{args} || {};
98
99 for my $ev (grep /^on_/, keys %$args) {
100 $args->{$ev} = sub {
101 my $id = shift->{s_id};
102 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
103
104 1
105 };
106 }
107
108 if (my $widget = eval {
109 local $SIG{__DIE__};
110 "CFPlus::UI::$arg->{class}"->new (
111 %$args,
112 s_ws => $arg->{ws},
113 s_id => $arg->{id},
114 )
115 }
116 ) {
117 $self->{widget}{$arg->{id}}
118 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
119 = $widget;
120
121 $widget->connect (on_destroy => sub {
122 my ($widget) = @_;
123
124 delete $self->{widget}{$widget->{s_id}};
125 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
126 });
127 } else {
128 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
129 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
130 }
131 });
132
133 $self->connect_ext (w_c => sub {
134 my ($arg) = @_;
135
136 my $w = $self->{widget}{$arg->{id}}
137 or return;
138 my $m = $arg->{name};
139
140 my $a = $arg->{args} || [];
141
142 if (exists $arg->{rid}) {
143 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
144 } else {
145 $w->$m (@$a);
146 }
147 });
148
149 $self->connect_ext (w_s => sub {
150 my ($arg) = @_;
151
152 my $w = $self->{widget}{$arg->{id}}
153 or return;
154
155 $w->{$arg->{name}} = $arg->{value};
156 });
157
158 $self->connect_ext (w_g => sub {
159 my ($arg) = @_;
160
161 my $w = $self->{widget}{$arg->{id}}
162 or return;
163
164 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
165 });
166
167 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
168 for my $ws (values %{delete $self->{widgetset} || {}}) {
169 $_->destroy
170 for values %{delete $ws->{w} || {}};
171 }
172 });
173
43 $self->{map_widget}->add_command (@$_) 174 $self->{map_widget}->add_command (@$_)
44 for @cmd_help; 175 for @cmd_help;
45
46 $self->{noface} = new_from_file CFPlus::Texture
47 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
48 176
49 { 177 {
50 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 178 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 179 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
52 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 180 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
53 } 181 }
54 182
183 {
184 $self->{noface} = my $tex = new_from_file CFPlus::Texture
185 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
186 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
187 }
188
55 $self->{open_container} = 0; 189 $self->{open_container} = 0;
56 190
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 191 # per server
64 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 192 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
65 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
66 193
67 $self 194 $self
68} 195}
69 196
70sub logprint { 197sub logprint {
… …
227 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 354 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
228 $::GAUGES->{food} ->set_value ($fo, $fo_m); 355 $::GAUGES->{food} ->set_value ($fo, $fo_m);
229 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 356 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
230 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 357 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
231 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 358 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
232 my $rng = $stats->{+CS_STAT_RANGE}; 359 $::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}; 360 my $title = $stats->{+CS_STAT_TITLE};
236 $title =~ s/^Player: //; 361 $title =~ s/^Player: //;
237 $::STATWIDS->{title} ->set_text ("Title: " . $title); 362 $::STATWIDS->{title} ->set_text ("Title: " . $title);
238 363
239 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 364 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
291 $::CONN->user_send ("use_skill $name"); 416 $::CONN->user_send ("use_skill $name");
292 } elsif ($ev->{button} == 3) { 417 } elsif ($ev->{button} == 3) {
293 my $shortname = CFPlus::shorten $name, 14; 418 my $shortname = CFPlus::shorten $name, 14;
294 (new CFPlus::UI::Menu 419 (new CFPlus::UI::Menu
295 items => [ 420 items => [
296 ["bind <i>ready_skill $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 421 ["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"]) }], 422 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
298 ], 423 ],
299 )->popup ($ev); 424 )->popup ($ev);
300 } else { 425 } else {
301 return 0; 426 return 0;
302 } 427 }
… …
319 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 444 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
320 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 445 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
321 } 446 }
322} 447}
323 448
449sub macro_send {
450 my ($self, $macro) = @_;
451
452 for my $cmd (@{ $macro->{action} }) {
453 $self->send_command ($cmd);
454 }
455}
456
324sub user_send { 457sub user_send {
325 my ($self, $command) = @_; 458 my ($self, $command) = @_;
326 459
327 push @{$self->{record}}, $command 460 $self->{record}->($command)
328 if $self->{record}; 461 if $self->{record};
329 462
330 $self->logprint ("send: ", $command); 463 $self->logprint ("send: ", $command);
331 $self->send_command ($command); 464 $self->send_command ($command);
332 ::status ($command); 465 ::status ($command);
333} 466}
334 467
335sub start_record { 468sub record {
336 my ($self) = @_; 469 my ($self, $cb) = @_;
337 470
338 $self->{record} = []; 471 $self->{record} = $cb;
339}
340
341sub stop_record {
342 my ($self) = @_;
343 return delete $self->{record};
344} 472}
345 473
346sub map_scroll { 474sub map_scroll {
347 my ($self, $dx, $dy) = @_; 475 my ($self, $dx, $dy) = @_;
348 476
… …
369 or return; 497 or return;
370 498
371 my ($hash, $x, $y, $w, $h) = @$map_info; 499 my ($hash, $x, $y, $w, $h) = @$map_info;
372 500
373 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 501 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
374 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 502 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
375 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 503 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
376} 504}
377 505
378sub map_clear { 506sub map_clear {
379 my ($self) = @_; 507 my ($self) = @_;
… …
383 511
384 $self->{map}->clear; 512 $self->{map}->clear;
385 delete $self->{map_widget}{magicmap}; 513 delete $self->{map_widget}{magicmap};
386} 514}
387 515
516sub bg_fetch {
517 my ($self) = @_;
518
519 my $id;
520
521 do {
522 $id = pop @{$self->{bg_fetch}}
523 or return;
524 } while $self->{texture}[$id];
525
526 CFPlus::DB::get tilecache => $id, sub {
527 my ($data) = @_;
528
529 return unless $self->{map}; # stop when destroyed
530
531 $self->set_texture ($id => $data)
532 if defined $data;
533
534 $self->bg_fetch;
535 };
536}
388 537
389sub load_map($$$) { 538sub load_map($$$) {
390 my ($self, $hash, $x, $y) = @_; 539 my ($self, $hash, $x, $y) = @_;
391 540
392 if (defined (my $data = $self->{mapcache}->get ($hash))) { 541 my $gen = $self->{map_change_gen};
542
543 CFPlus::DB::get $self->{mapcache} => $hash, sub {
544 return unless $gen == $self->{map_change_gen};
545
546 my ($data) = @_;
547
548 if (defined $data) {
393 $data = Compress::LZF::decompress $data; 549 $data = Compress::LZF::decompress $data;
394 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 550 #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 551
399 $self->set_texture ($id => $data); 552 my $inprogress = @{ $self->{bg_fetch} || [] };
553 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
554 $self->bg_fetch unless $inprogress;
400 } 555 }
401 } 556 };
402} 557}
403 558
404# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 559# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
405# (server resource,s latency, bandwidth), so this hack is warranted. 560# (server resource,s latency, bandwidth), so this hack is warranted.
406# the right fix is to make real tiled maps with an overview file 561# the right fix is to make real tiled maps with an overview file
… …
470 625
471 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 626 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
472 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 627 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
473 628
474 } else { 629 } else {
630 my $gen = $self->{map_change_gen};
475 $self->send_mapinfo ("spatial $path$tile", sub { 631 $self->send_mapinfo ("spatial $path$tile", sub {
632 return unless $gen == $self->{map_change_gen};
633
476 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 634 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
477 635
478 return if $mode ne "spatial"; 636 return if $mode ne "spatial";
479 637
480 $x += $self->{map}->ox; 638 $x += $self->{map}->ox;
… …
494 652
495sub map_change { 653sub map_change {
496 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 654 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
497 655
498 $self->flush_map; 656 $self->flush_map;
657
658 ++$self->{map_change_gen};
499 659
500 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 660 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
501 661
502 my $mapmapw = $self->{mapmap}->{w}; 662 my $mapmapw = $self->{mapmap}->{w};
503 my $mapmaph = $self->{mapmap}->{h}; 663 my $mapmaph = $self->{mapmap}->{h};
… …
520 $self->load_map ($hash, $x, $y); 680 $self->load_map ($hash, $x, $y);
521 $self->flood_fill (0, 0, 0, "", $hash, $flags); 681 $self->flood_fill (0, 0, 0, "", $hash, $flags);
522} 682}
523 683
524sub face_find { 684sub face_find {
525 my ($self, $facenum, $face) = @_; 685 my ($self, $facenum, $face, $cb) = @_;
526 686
527 my $hash = "$face->{chksum},$face->{name}"; 687 my $hash = "$face->{chksum},$face->{name}";
528 688
529 my $id = $self->{facemap}->get ($hash); 689 my $id = CFPlus::DB::get_tile_id_sync $hash;
530 690
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; 691 $face->{id} = $id;
554 $self->{map}->set_face ($facenum => $id);
555 $self->{faceid}[$facenum] = $id;#d# 692 $self->{faceid}[$facenum] = $id;
556 693
557 my $face = $self->{tilecache}->get ($id); 694 $self->{map}->set_tileid ($facenum => $id);
558 695
559 if ($face) { 696 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} 697}
568 698
569sub face_update { 699sub face_update {
570 my ($self, $facenum, $face, $changed) = @_; 700 my ($self, $facenum, $face, $changed) = @_;
571 701
572 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 702 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
703 if $changed;
573 704
574 $self->set_texture ($face->{id} => delete $face->{image}); 705 $self->set_texture ($face->{id} => delete $face->{image});
706}
707
708sub smooth_update {
709 my ($self, $facenum, $face) = @_;
710
711 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
575} 712}
576 713
577sub set_texture { 714sub set_texture {
578 my ($self, $id, $data) = @_; 715 my ($self, $id, $data) = @_;
579 716
580 $self->{texture}[$id] ||= do { 717 $self->{texture}[$id] = my $tex =
581 my $tex =
582 new_from_image CFPlus::Texture 718 new_from_image CFPlus::Texture
583 $data, minify => 1, mipmap => 1; 719 $data, minify => 1, mipmap => 1;
584 720
585 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 721 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
586 $self->{map_widget}->update; 722 $self->{map_widget}->update;
587
588 $tex
589 };
590} 723}
591 724
592sub sound_play { 725sub sound_play {
593 my ($self, $x, $y, $soundnum, $type) = @_; 726 my ($self, $x, $y, $soundnum, $type) = @_;
594 727
… …
604 $LAST_QUERY = $prompt; 737 $LAST_QUERY = $prompt;
605 738
606 $self->{query}-> ($self, $flags, $prompt); 739 $self->{query}-> ($self, $flags, $prompt);
607} 740}
608 741
609sub drawinfo { 742sub sanitise_xml($) {
610 my ($self, $color, $text) = @_; 743 local $_ = shift;
611 744
612 my @color = ( 745 # we now weed out all tags we do not support
746 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
747 # now all entities
748 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
749
750 # handle some elements
751 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
752 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
753
754 $_
755}
756
757our %NAME_TO_COLOR = (
758 black => 0,
759 white => 1,
760 darkblue => 2,
761 red => 3,
762 orange => 4,
763 lightblue => 5,
764 darkorange => 6,
765 green => 7,
766 darkgreen => 8,
767 grey => 9,
768 brown => 10,
769 yellow => 11,
770 tan => 12,
771);
772
773our @CF_COLOR = (
613 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 774 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
614 [1.00, 1.00, 1.00], 775 [1.00, 1.00, 1.00],
615 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 776 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
616 [1.00, 0.00, 0.00], 777 [1.00, 0.00, 0.00],
617 [1.00, 0.54, 0.00], 778 [1.00, 0.54, 0.00],
618 [0.11, 0.56, 1.00], 779 [0.11, 0.56, 1.00],
619 [0.93, 0.46, 0.00], 780 [0.93, 0.46, 0.00],
620 [0.18, 0.54, 0.34], 781 [0.18, 0.54, 0.34],
621 [0.56, 0.73, 0.56], 782 [0.56, 0.73, 0.56],
622 [0.80, 0.80, 0.80], 783 [0.80, 0.80, 0.80],
623 [0.75, 0.61, 0.20], 784 [0.75, 0.61, 0.20],
624 [0.99, 0.77, 0.26], 785 [0.99, 0.77, 0.26],
625 [0.74, 0.65, 0.41], 786 [0.74, 0.65, 0.41],
626 ); 787);
627 788
789sub msg {
790 my ($self, $color, $type, $text, @extra) = @_;
791
792 $text = sanitise_xml $text;
793
794 if (my $cb = $self->{cb_msg}{$type}) {
795 $_->($self, $color, $type, $text, @extra) for values %$cb;
796 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
797 $type =~ s/-/_/g;
798 $self->{$type} = $text;
799 } else {
628 $self->logprint ("info: ", $text); 800 $self->logprint ("msg: ", $text);
801 return if $color < 0; # negative color == ignore if not understood
629 802
803 my $fg = $CF_COLOR[$color % @CF_COLOR];
804
630 # try to create single paragraphs of multiple lines sent by the server 805 ## try to create single paragraphs of multiple lines sent by the server
806 # no longer neecssary with TRT servers
631 $text =~ s/(?<=\S)\n(?=\w)/ /g; 807 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
632 808
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 => $_ }) 809 ::message ({ fg => $fg, markup => $_ })
638 for split /\n/, $text; 810 for split /\n/, $text;
639 811
640 $self->{statusbox}->add ($text, 812 $self->{statusbox}->add ($text,
641 group => $text, 813 group => $text,
642 fg => $color[$color], 814 fg => $fg,
643 timeout => $color >= 2 ? 180 : 10, 815 timeout => $color >= 2 ? 180 : 10,
644 tooltip_font => $::FONT_FIXED, 816 tooltip_font => $::FONT_FIXED,
645 ); 817 );
646} 818 }
647
648sub drawextinfo {
649 my ($self, $color, $type, $subtype, $message) = @_;
650
651 $self->drawinfo ($color, $message);
652} 819}
653 820
654sub spell_add { 821sub spell_add {
655 my ($self, $spell) = @_; 822 my ($self, $spell) = @_;
656 823
… …
672} 839}
673 840
674sub setup { 841sub setup {
675 my ($self, $setup) = @_; 842 my ($self, $setup) = @_;
676 843
844 $self->{map_widget}->set_tilesize ($self->{tilesize});
677 $::MAP->resize ($self->{mapw}, $self->{maph}); 845 $::MAP->resize ($self->{mapw}, $self->{maph});
678} 846}
679 847
680sub addme_success { 848sub addme_success {
681 my ($self) = @_; 849 my ($self) = @_;
… …
888 $::SERVER_INFO->set_markup ( 1056 $::SERVER_INFO->set_markup (
889 "server <tt>$self->{host}:$self->{port}</tt>\n" 1057 "server <tt>$self->{host}:$self->{port}</tt>\n"
890 . "protocol version <tt>$self->{version}</tt>\n" 1058 . "protocol version <tt>$self->{version}</tt>\n"
891 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1059 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
892 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1060 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1061 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
893 . "editing support $yesno[!!$self->{editor_support}]\n" 1062 . "editing support $yesno[!!$self->{editor_support}]\n"
894 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1063 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1064 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
895 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1065 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
896 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1066 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
897 . "map size $self->{mapw}×$self->{maph}\n" 1067 . "map size $self->{mapw}×$self->{maph}\n"
898 ); 1068 );
899 1069
… …
921 1091
922 $self->update_server_info; 1092 $self->update_server_info;
923 1093
924 $self->send_command ("output-sync $::CFG->{output_sync}"); 1094 $self->send_command ("output-sync $::CFG->{output_sync}");
925 $self->send_command ("output-count $::CFG->{output_count}"); 1095 $self->send_command ("output-count $::CFG->{output_count}");
1096 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
926 $self->send_command ("pickup $::CFG->{pickup}"); 1097 $self->send_command ("pickup $::CFG->{pickup}");
927} 1098}
928 1099
929sub buildat { 1100sub buildat {
930 my ($self, $builditem, $x, $y) = @_; 1101 my ($self, $builditem, $x, $y) = @_;
… …
961 1132
962 (delete $self->{npc_dialog})->destroy 1133 (delete $self->{npc_dialog})->destroy
963 if $self->{npc_dialog}; 1134 if $self->{npc_dialog};
964 1135
965 $self->SUPER::destroy; 1136 $self->SUPER::destroy;
1137
1138 %$self = ();
966} 1139}
967 1140
968package CFPlus::NPCDialog; 1141package CFPlus::NPCDialog;
969 1142
970our @ISA = 'CFPlus::UI::Toplevel'; 1143our @ISA = 'CFPlus::UI::Toplevel';
… …
982 kw => { hi => 0, yes => 0, no => 0 }, 1155 kw => { hi => 0, yes => 0, no => 0 },
983 has_close_button => 1, 1156 has_close_button => 1,
984 @_, 1157 @_,
985 ); 1158 );
986 1159
987 Scalar::Util::weaken (my $this = $self); 1160 CFPlus::weaken (my $this = $self);
988 1161
989 $self->connect (delete => sub { $this->destroy; 1 }); 1162 $self->connect (delete => sub { $this->destroy; 1 });
990 1163
991 # better use a pane... 1164 # better use a pane...
992 $self->add (my $hbox = new CFPlus::UI::HBox); 1165 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1036}; 1209};
1037 1210
1038sub update_options { 1211sub update_options {
1039 my ($self) = @_; 1212 my ($self) = @_;
1040 1213
1041 Scalar::Util::weaken $self; 1214 CFPlus::weaken $self;
1042 1215
1043 $self->{options}->clear; 1216 $self->{options}->clear;
1044 $self->{options}->add ($self->{bye_button}); 1217 $self->{options}->add ($self->{bye_button});
1045 1218
1046 for my $kw (sort keys %{ $self->{kw} }) { 1219 for my $kw (sort keys %{ $self->{kw} }) {
… …
1055} 1228}
1056 1229
1057sub feed { 1230sub feed {
1058 my ($self, $msg) = @_; 1231 my ($self, $msg) = @_;
1059 1232
1060 Scalar::Util::weaken $self; 1233 CFPlus::weaken $self;
1061 1234
1062 if ($msg->{msgtype} eq "reply") { 1235 if ($msg->{msgtype} eq "reply") {
1063 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1236 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1064 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1237 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1065 1238
1066 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1239 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} }; 1240 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1068 my @link; 1241 my @link;
1069 $text =~ s{ 1242 $text =~ s{
1070 ($match) 1243 ($match)
1071 }{ 1244 }{

Diff Legend

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