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

Diff Legend

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