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

Diff Legend

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