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.105 by root, Tue Apr 24 01:13:15 2007 UTC vs.
Revision 1.113 by root, Thu Jul 12 17:56:51 2007 UTC

21 21
22 my $self = $class->SUPER::new (%arg, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 excmd => 1, 25 excmd => 1,
26 ywidget => 1,
26 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
27 }, 28 },
28 ); 29 );
29 30
30 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
47 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
48 @args 49 @args
49 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
50 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
51 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 my $pri = -100;
63 for my $face (@$faces) {
64 if (defined (my $chksum = $ev->{chksum}{$face})) {
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 ::message ({ markup => "starting to download song #$face, check your output-rate setting if your connection gets laggy." });
71 $self->ask_face ($face, $pri, undef, sub {
72 my $num = $_[0];
73 my $len = length $_[1];
74 my ($meta, $data) = unpack "(w/a*)*", $_[1];
75
76 CFPlus::DB::write_file $chksum, $data, sub { };
77 CFPlus::DB::put resmap => $chksum => $meta, sub { };
78
79 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
80 ::message ({ markup => "downloaded song #$face, size $len octets" });
81
82 &::audio_music_set ($self->{songs});
83 });
84 }
85
86 push @songs, $self->{music_map}{$face};
87 --$pri;
88 }
89
90 &::audio_music_set ($self->{songs} = \@songs);
91 });
92
52 $self->connect_ext (event_capabilities => sub { 93 $self->connect_ext (event_capabilities => sub {
53 my ($cap) = @_; 94 my ($cap) = @_;
54 95
55 if (my $ts = $cap->{tileset}) { 96 if (my $ts = $cap->{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) { 97 if (my ($default) = grep $_->[2] & 1, @$ts) {
61 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 102 my $w = int $self->{mapw} * 32 / $self->{tilesize};
62 my $h = int $self->{maph} * 32 / $self->{tilesize}; 103 my $h = int $self->{maph} * 32 / $self->{tilesize};
63 104
64 $self->setup_req (mapsize => "${w}x${h}"); 105 $self->setup_req (mapsize => "${w}x${h}");
65 } 106 }
107 }
108 });
109
110 $self->{json_coder}
111 ->convert_blessed
112 ->filter_json_single_key_object (__widget_ref__ => sub {
113 $self->{widget}{$_[0]}
114 });
115
116 $self->connect_ext (ws_n => sub {
117 my ($arg) = @_;
118
119 $self->{widgetset}{$arg{id}} = {
120 w => {},
121 };
122 });
123
124 $self->connect_ext (ws_d => sub {
125 my ($arg) = @_;
126
127 my $ws = delete $self->{widgetset}{$arg{id}}
128 or return;
129
130 $_->destroy
131 for values %{$ws->{w}};
132 });
133
134 $self->connect_ext (ws_c => sub {
135 my ($arg) = @_;
136
137 my $args = $arg->{args} || {};
138
139 for my $ev (grep /^on_/, keys %$args) {
140 $args->{$ev} = sub {
141 my $id = shift->{s_id};
142 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
143
144 1
145 };
146 }
147
148 if (my $widget = eval {
149 local $SIG{__DIE__};
150 "CFPlus::UI::$arg->{class}"->new (
151 %$args,
152 s_ws => $arg->{ws},
153 s_id => $arg->{id},
154 )
155 }
156 ) {
157 $self->{widget}{$arg->{id}}
158 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
159 = $widget;
160
161 $widget->connect (on_destroy => sub {
162 my ($widget) = @_;
163
164 delete $self->{widget}{$widget->{s_id}};
165 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
166 });
167 } else {
168 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
169 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
170 }
171 });
172
173 $self->connect_ext (w_c => sub {
174 my ($arg) = @_;
175
176 my $w = $self->{widget}{$arg->{id}}
177 or return;
178 my $m = $arg->{name};
179
180 my $a = $arg->{args} || [];
181
182 if (exists $arg->{rid}) {
183 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
184 } else {
185 $w->$m (@$a);
186 }
187 });
188
189 $self->connect_ext (w_s => sub {
190 my ($arg) = @_;
191
192 my $w = $self->{widget}{$arg->{id}}
193 or return;
194
195 $w->{$arg->{name}} = $arg->{value};
196 });
197
198 $self->connect_ext (w_g => sub {
199 my ($arg) = @_;
200
201 my $w = $self->{widget}{$arg->{id}}
202 or return;
203
204 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
205 });
206
207 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
208 for my $ws (values %{delete $self->{widgetset} || {}}) {
209 $_->destroy
210 for values %{delete $ws->{w} || {}};
66 } 211 }
67 }); 212 });
68 213
69 $self->{map_widget}->add_command (@$_) 214 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 215 for @cmd_help;
249 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 394 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
250 $::GAUGES->{food} ->set_value ($fo, $fo_m); 395 $::GAUGES->{food} ->set_value ($fo, $fo_m);
251 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 396 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
252 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 397 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
253 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 398 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
254 my $rng = $stats->{+CS_STAT_RANGE}; 399 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
255 $rng =~ s/^Range: //; # thank you so much dear server
256 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
257 my $title = $stats->{+CS_STAT_TITLE}; 400 my $title = $stats->{+CS_STAT_TITLE};
258 $title =~ s/^Player: //; 401 $title =~ s/^Player: //;
259 $::STATWIDS->{title} ->set_text ("Title: " . $title); 402 $::STATWIDS->{title} ->set_text ("Title: " . $title);
260 403
261 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 404 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
634 $LAST_QUERY = $prompt; 777 $LAST_QUERY = $prompt;
635 778
636 $self->{query}-> ($self, $flags, $prompt); 779 $self->{query}-> ($self, $flags, $prompt);
637} 780}
638 781
782sub sanitise_xml($) {
783 local $_ = shift;
784
785 # we now weed out all tags we do not support
786 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
787 # now all entities
788 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
789
790 # handle some elements
791 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
792 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
793
794 $_
795}
796
639our %NAME_TO_COLOR = ( 797our %NAME_TO_COLOR = (
640 black => 0, 798 black => 0,
641 white => 1, 799 white => 1,
642 darkblue => 2, 800 darkblue => 2,
643 red => 3, 801 red => 3,
668 [0.74, 0.65, 0.41], 826 [0.74, 0.65, 0.41],
669); 827);
670 828
671sub msg { 829sub msg {
672 my ($self, $color, $type, $text, @extra) = @_; 830 my ($self, $color, $type, $text, @extra) = @_;
831
832 $text = sanitise_xml $text;
673 833
674 if (my $cb = $self->{cb_msg}{$type}) { 834 if (my $cb = $self->{cb_msg}{$type}) {
675 $_->($self, $color, $type, $text, @extra) for values %$cb; 835 $_->($self, $color, $type, $text, @extra) for values %$cb;
676 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 836 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
677 $type =~ s/-/_/g; 837 $type =~ s/-/_/g;
1012 1172
1013 (delete $self->{npc_dialog})->destroy 1173 (delete $self->{npc_dialog})->destroy
1014 if $self->{npc_dialog}; 1174 if $self->{npc_dialog};
1015 1175
1016 $self->SUPER::destroy; 1176 $self->SUPER::destroy;
1177
1178 %$self = ();
1017} 1179}
1018 1180
1019package CFPlus::NPCDialog; 1181package CFPlus::NPCDialog;
1020 1182
1021our @ISA = 'CFPlus::UI::Toplevel'; 1183our @ISA = 'CFPlus::UI::Toplevel';
1112 1274
1113 if ($msg->{msgtype} eq "reply") { 1275 if ($msg->{msgtype} eq "reply") {
1114 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1276 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1115 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1277 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1116 1278
1117 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1279 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1118 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1280 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1119 my @link; 1281 my @link;
1120 $text =~ s{ 1282 $text =~ s{
1121 ($match) 1283 ($match)
1122 }{ 1284 }{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines