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.98 by root, Fri Apr 6 19:17:25 2007 UTC vs.
Revision 1.120 by root, Sat Jul 14 13:04:42 2007 UTC

… …
15use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
16 16
17use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
18 18
19sub new { 19sub new {
20 my $class = shift; 20 my ($class, %arg) = @_;
21 21
22 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 );
23 30
24 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
25 32
26 my @cmd_help = map { 33 my @cmd_help = map {
27 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
41 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
42 @args 49 @args
43 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
44 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
45 52
53 $self->connect_ext (event_music => sub {
54 my ($ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev->{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev->{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 } else {
80 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
81 $self->ask_face ($face, -100 - $pri, undef, sub {
82 my $len = length $_[1];
83 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
84
85 CFPlus::DB::write_file $path, $data, sub {
86 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
87 my $meta = $self->{json_coder}->decode ($meta_json);
88 $meta->{path} = $path;
89 $self->{music_meta}{$chksum} = $meta;
90
91 ::message ({ markup => "downloaded song #$face, size $len octets" });
92 &::audio_music_set ($self->{songs});
93 };
94 };
95 });
96 }
97 }
98 }
99 }
100
101 if (my $play = $ev->{play}) {
102 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
103 }
104 });
105
46 $self->connect_ext (event_capabilities => sub { 106 $self->connect_ext (event_capabilities => sub {
47 my ($cap) = @_; 107 my ($cap) = @_;
48 108
49 if (my $ts = $cap->{tileset}) { 109 if (my $ts = $cap->{tileset}) {
50 if (my ($default) = grep $_->[2] & 1, @$ts) { 110 if (my ($default) = grep $_->[2] & 1, @$ts) {
… …
55 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 115 my $w = int $self->{mapw} * 32 / $self->{tilesize};
56 my $h = int $self->{maph} * 32 / $self->{tilesize}; 116 my $h = int $self->{maph} * 32 / $self->{tilesize};
57 117
58 $self->setup_req (mapsize => "${w}x${h}"); 118 $self->setup_req (mapsize => "${w}x${h}");
59 } 119 }
120 }
121 });
122
123 $self->{json_coder}
124 ->convert_blessed
125 ->filter_json_single_key_object (__widget_ref__ => sub {
126 $self->{widget}{$_[0]}
127 });
128
129 $self->connect_ext (ws_n => sub {
130 my ($arg) = @_;
131
132 $self->{widgetset}{$arg{id}} = {
133 w => {},
134 };
135 });
136
137 $self->connect_ext (ws_d => sub {
138 my ($arg) = @_;
139
140 my $ws = delete $self->{widgetset}{$arg{id}}
141 or return;
142
143 $_->destroy
144 for values %{$ws->{w}};
145 });
146
147 $self->connect_ext (ws_c => sub {
148 my ($arg) = @_;
149
150 my $args = $arg->{args} || {};
151
152 for my $ev (grep /^on_/, keys %$args) {
153 $args->{$ev} = sub {
154 my $id = shift->{s_id};
155 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
156
157 1
158 };
159 }
160
161 if (my $widget = eval {
162 local $SIG{__DIE__};
163 "CFPlus::UI::$arg->{class}"->new (
164 %$args,
165 s_ws => $arg->{ws},
166 s_id => $arg->{id},
167 )
168 }
169 ) {
170 $self->{widget}{$arg->{id}}
171 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
172 = $widget;
173
174 $widget->connect (on_destroy => sub {
175 my ($widget) = @_;
176
177 delete $self->{widget}{$widget->{s_id}};
178 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
179 });
180 } else {
181 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
182 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
183 }
184 });
185
186 $self->connect_ext (w_c => sub {
187 my ($arg) = @_;
188
189 my $w = $self->{widget}{$arg->{id}}
190 or return;
191 my $m = $arg->{name};
192
193 my $a = $arg->{args} || [];
194
195 if (exists $arg->{rid}) {
196 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
197 } else {
198 $w->$m (@$a);
199 }
200 });
201
202 $self->connect_ext (w_s => sub {
203 my ($arg) = @_;
204
205 my $w = $self->{widget}{$arg->{id}}
206 or return;
207
208 $w->{$arg->{name}} = $arg->{value};
209 });
210
211 $self->connect_ext (w_g => sub {
212 my ($arg) = @_;
213
214 my $w = $self->{widget}{$arg->{id}}
215 or return;
216
217 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
218 });
219
220 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
221 for my $ws (values %{delete $self->{widgetset} || {}}) {
222 $_->destroy
223 for values %{delete $ws->{w} || {}};
60 } 224 }
61 }); 225 });
62 226
63 $self->{map_widget}->add_command (@$_) 227 $self->{map_widget}->add_command (@$_)
64 for @cmd_help; 228 for @cmd_help;
… …
243 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 407 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
244 $::GAUGES->{food} ->set_value ($fo, $fo_m); 408 $::GAUGES->{food} ->set_value ($fo, $fo_m);
245 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 409 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
246 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 410 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
247 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 411 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
248 my $rng = $stats->{+CS_STAT_RANGE}; 412 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
249 $rng =~ s/^Range: //; # thank you so much dear server
250 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
251 my $title = $stats->{+CS_STAT_TITLE}; 413 my $title = $stats->{+CS_STAT_TITLE};
252 $title =~ s/^Player: //; 414 $title =~ s/^Player: //;
253 $::STATWIDS->{title} ->set_text ("Title: " . $title); 415 $::STATWIDS->{title} ->set_text ("Title: " . $title);
254 416
255 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 417 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
427} 589}
428 590
429sub load_map($$$) { 591sub load_map($$$) {
430 my ($self, $hash, $x, $y) = @_; 592 my ($self, $hash, $x, $y) = @_;
431 593
594 my $gen = $self->{map_change_gen};
595
432 CFPlus::DB::get $self->{mapcache} => $hash, sub { 596 CFPlus::DB::get $self->{mapcache} => $hash, sub {
597 return unless $gen == $self->{map_change_gen};
598
433 my ($data) = @_; 599 my ($data) = @_;
434 600
435 if (defined $data) { 601 if (defined $data) {
436 $data = Compress::LZF::decompress $data; 602 $data = Compress::LZF::decompress $data;
437 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 603 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
… …
512 678
513 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 679 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
514 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 680 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
515 681
516 } else { 682 } else {
683 my $gen = $self->{map_change_gen};
517 $self->send_mapinfo ("spatial $path$tile", sub { 684 $self->send_mapinfo ("spatial $path$tile", sub {
685 return unless $gen == $self->{map_change_gen};
686
518 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 687 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
519 688
520 return if $mode ne "spatial"; 689 return if $mode ne "spatial";
521 690
522 $x += $self->{map}->ox; 691 $x += $self->{map}->ox;
… …
536 705
537sub map_change { 706sub map_change {
538 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 707 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
539 708
540 $self->flush_map; 709 $self->flush_map;
710
711 ++$self->{map_change_gen};
541 712
542 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 713 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
543 714
544 my $mapmapw = $self->{mapmap}->{w}; 715 my $mapmapw = $self->{mapmap}->{w};
545 my $mapmaph = $self->{mapmap}->{h}; 716 my $mapmaph = $self->{mapmap}->{h};
… …
585 if $changed; 756 if $changed;
586 757
587 $self->set_texture ($face->{id} => delete $face->{image}); 758 $self->set_texture ($face->{id} => delete $face->{image});
588} 759}
589 760
761sub smooth_update {
762 my ($self, $facenum, $face) = @_;
763
764 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
765}
766
590sub set_texture { 767sub set_texture {
591 my ($self, $id, $data) = @_; 768 my ($self, $id, $data) = @_;
769
770 return unless $self->{map};
592 771
593 $self->{texture}[$id] = my $tex = 772 $self->{texture}[$id] = my $tex =
594 new_from_image CFPlus::Texture 773 new_from_image CFPlus::Texture
595 $data, minify => 1, mipmap => 1; 774 $data, minify => 1, mipmap => 1;
596 775
… …
613 $LAST_QUERY = $prompt; 792 $LAST_QUERY = $prompt;
614 793
615 $self->{query}-> ($self, $flags, $prompt); 794 $self->{query}-> ($self, $flags, $prompt);
616} 795}
617 796
618sub drawinfo { 797sub sanitise_xml($) {
619 my ($self, $color, $text) = @_; 798 local $_ = shift;
620 799
621 my @color = ( 800 # we now weed out all tags we do not support
801 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
802 # now all entities
803 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
804
805 # handle some elements
806 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
807 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
808
809 $_
810}
811
812our %NAME_TO_COLOR = (
813 black => 0,
814 white => 1,
815 darkblue => 2,
816 red => 3,
817 orange => 4,
818 lightblue => 5,
819 darkorange => 6,
820 green => 7,
821 darkgreen => 8,
822 grey => 9,
823 brown => 10,
824 yellow => 11,
825 tan => 12,
826);
827
828our @CF_COLOR = (
622 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 829 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
623 [1.00, 1.00, 1.00], 830 [1.00, 1.00, 1.00],
624 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 831 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
625 [1.00, 0.00, 0.00], 832 [1.00, 0.00, 0.00],
626 [1.00, 0.54, 0.00], 833 [1.00, 0.54, 0.00],
627 [0.11, 0.56, 1.00], 834 [0.11, 0.56, 1.00],
628 [0.93, 0.46, 0.00], 835 [0.93, 0.46, 0.00],
629 [0.18, 0.54, 0.34], 836 [0.18, 0.54, 0.34],
630 [0.56, 0.73, 0.56], 837 [0.56, 0.73, 0.56],
631 [0.80, 0.80, 0.80], 838 [0.80, 0.80, 0.80],
632 [0.75, 0.61, 0.20], 839 [0.75, 0.61, 0.20],
633 [0.99, 0.77, 0.26], 840 [0.99, 0.77, 0.26],
634 [0.74, 0.65, 0.41], 841 [0.74, 0.65, 0.41],
635 ); 842);
636 843
637 my $fg = $color[$color % @color]; 844sub msg {
845 my ($self, $color, $type, $text, @extra) = @_;
638 846
847 $text = sanitise_xml $text;
848
849 if (my $cb = $self->{cb_msg}{$type}) {
850 $_->($self, $color, $type, $text, @extra) for values %$cb;
851 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
852 $type =~ s/-/_/g;
853 $self->{$type} = $text;
854 } else {
639 $self->logprint ("info: ", $text); 855 $self->logprint ("msg: ", $text);
856 return if $color < 0; # negative color == ignore if not understood
640 857
858 my $fg = $CF_COLOR[$color % @CF_COLOR];
859
641 # try to create single paragraphs of multiple lines sent by the server 860 ## try to create single paragraphs of multiple lines sent by the server
861 # no longer neecssary with TRT servers
642 $text =~ s/(?<=\S)\n(?=\w)/ /g; 862 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
643 863
644 $text = CFPlus::asxml $text;
645 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
646 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
647
648 ::message ({ fg => $fg, markup => $_ }) 864 ::message ({ fg => $fg, markup => $_ })
649 for split /\n/, $text; 865 for split /\n/, $text;
650 866
651 $self->{statusbox}->add ($text, 867 $self->{statusbox}->add ($text,
652 group => $text, 868 group => $text,
653 fg => $fg, 869 fg => $fg,
654 timeout => $color >= 2 ? 180 : 10, 870 timeout => $color >= 2 ? 180 : 10,
655 tooltip_font => $::FONT_FIXED, 871 tooltip_font => $::FONT_FIXED,
656 ); 872 );
657} 873 }
658
659sub drawextinfo {
660 my ($self, $color, $type, $subtype, $message) = @_;
661
662 $self->drawinfo ($color, $message);
663} 874}
664 875
665sub spell_add { 876sub spell_add {
666 my ($self, $spell) = @_; 877 my ($self, $spell) = @_;
667 878
… …
900 $::SERVER_INFO->set_markup ( 1111 $::SERVER_INFO->set_markup (
901 "server <tt>$self->{host}:$self->{port}</tt>\n" 1112 "server <tt>$self->{host}:$self->{port}</tt>\n"
902 . "protocol version <tt>$self->{version}</tt>\n" 1113 . "protocol version <tt>$self->{version}</tt>\n"
903 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1114 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
904 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1115 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1116 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
905 . "editing support $yesno[!!$self->{editor_support}]\n" 1117 . "editing support $yesno[!!$self->{editor_support}]\n"
906 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1118 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1119 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
907 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1120 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
908 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1121 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
909 . "map size $self->{mapw}×$self->{maph}\n" 1122 . "map size $self->{mapw}×$self->{maph}\n"
910 ); 1123 );
911 1124
… …
974 1187
975 (delete $self->{npc_dialog})->destroy 1188 (delete $self->{npc_dialog})->destroy
976 if $self->{npc_dialog}; 1189 if $self->{npc_dialog};
977 1190
978 $self->SUPER::destroy; 1191 $self->SUPER::destroy;
1192
1193 %$self = ();
979} 1194}
980 1195
981package CFPlus::NPCDialog; 1196package CFPlus::NPCDialog;
982 1197
983our @ISA = 'CFPlus::UI::Toplevel'; 1198our @ISA = 'CFPlus::UI::Toplevel';
… …
1074 1289
1075 if ($msg->{msgtype} eq "reply") { 1290 if ($msg->{msgtype} eq "reply") {
1076 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1291 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1077 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1292 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1078 1293
1079 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1294 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1080 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1295 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1081 my @link; 1296 my @link;
1082 $text =~ s{ 1297 $text =~ s{
1083 ($match) 1298 ($match)
1084 }{ 1299 }{

Diff Legend

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