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.104 by root, Mon Apr 23 19:22:24 2007 UTC vs.
Revision 1.121 by root, Sat Jul 14 13:08:40 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 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 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev->{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 });
106
52 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (event_capabilities => sub {
53 my ($cap) = @_; 108 my ($cap) = @_;
54 109
55 if (my $ts = $cap->{tileset}) { 110 if (my $ts = $cap->{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) { 111 if (my ($default) = grep $_->[2] & 1, @$ts) {
61 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 116 my $w = int $self->{mapw} * 32 / $self->{tilesize};
62 my $h = int $self->{maph} * 32 / $self->{tilesize}; 117 my $h = int $self->{maph} * 32 / $self->{tilesize};
63 118
64 $self->setup_req (mapsize => "${w}x${h}"); 119 $self->setup_req (mapsize => "${w}x${h}");
65 } 120 }
121 }
122 });
123
124 $self->{json_coder}
125 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub {
127 $self->{widget}{$_[0]}
128 });
129
130 $self->connect_ext (ws_n => sub {
131 my ($arg) = @_;
132
133 $self->{widgetset}{$arg{id}} = {
134 w => {},
135 };
136 });
137
138 $self->connect_ext (ws_d => sub {
139 my ($arg) = @_;
140
141 my $ws = delete $self->{widgetset}{$arg{id}}
142 or return;
143
144 $_->destroy
145 for values %{$ws->{w}};
146 });
147
148 $self->connect_ext (ws_c => sub {
149 my ($arg) = @_;
150
151 my $args = $arg->{args} || {};
152
153 for my $ev (grep /^on_/, keys %$args) {
154 $args->{$ev} = sub {
155 my $id = shift->{s_id};
156 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
157
158 1
159 };
160 }
161
162 if (my $widget = eval {
163 local $SIG{__DIE__};
164 "CFPlus::UI::$arg->{class}"->new (
165 %$args,
166 s_ws => $arg->{ws},
167 s_id => $arg->{id},
168 )
169 }
170 ) {
171 $self->{widget}{$arg->{id}}
172 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
173 = $widget;
174
175 $widget->connect (on_destroy => sub {
176 my ($widget) = @_;
177
178 delete $self->{widget}{$widget->{s_id}};
179 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
180 });
181 } else {
182 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
183 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
184 }
185 });
186
187 $self->connect_ext (w_c => sub {
188 my ($arg) = @_;
189
190 my $w = $self->{widget}{$arg->{id}}
191 or return;
192 my $m = $arg->{name};
193
194 my $a = $arg->{args} || [];
195
196 if (exists $arg->{rid}) {
197 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
198 } else {
199 $w->$m (@$a);
200 }
201 });
202
203 $self->connect_ext (w_s => sub {
204 my ($arg) = @_;
205
206 my $w = $self->{widget}{$arg->{id}}
207 or return;
208
209 $w->{$arg->{name}} = $arg->{value};
210 });
211
212 $self->connect_ext (w_g => sub {
213 my ($arg) = @_;
214
215 my $w = $self->{widget}{$arg->{id}}
216 or return;
217
218 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
219 });
220
221 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
222 for my $ws (values %{delete $self->{widgetset} || {}}) {
223 $_->destroy
224 for values %{delete $ws->{w} || {}};
66 } 225 }
67 }); 226 });
68 227
69 $self->{map_widget}->add_command (@$_) 228 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 229 for @cmd_help;
249 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 408 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
250 $::GAUGES->{food} ->set_value ($fo, $fo_m); 409 $::GAUGES->{food} ->set_value ($fo, $fo_m);
251 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 410 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
252 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 411 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
253 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 412 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
254 my $rng = $stats->{+CS_STAT_RANGE}; 413 $::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}; 414 my $title = $stats->{+CS_STAT_TITLE};
258 $title =~ s/^Player: //; 415 $title =~ s/^Player: //;
259 $::STATWIDS->{title} ->set_text ("Title: " . $title); 416 $::STATWIDS->{title} ->set_text ("Title: " . $title);
260 417
261 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 418 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
609} 766}
610 767
611sub set_texture { 768sub set_texture {
612 my ($self, $id, $data) = @_; 769 my ($self, $id, $data) = @_;
613 770
771 return unless $self->{map};
772
614 $self->{texture}[$id] = my $tex = 773 $self->{texture}[$id] = my $tex =
615 new_from_image CFPlus::Texture 774 new_from_image CFPlus::Texture
616 $data, minify => 1, mipmap => 1; 775 $data, minify => 1, mipmap => 1;
617 776
618 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 777 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
633 $prompt = $LAST_QUERY unless length $prompt; 792 $prompt = $LAST_QUERY unless length $prompt;
634 $LAST_QUERY = $prompt; 793 $LAST_QUERY = $prompt;
635 794
636 $self->{query}-> ($self, $flags, $prompt); 795 $self->{query}-> ($self, $flags, $prompt);
637} 796}
797
798sub sanitise_xml($) {
799 local $_ = shift;
800
801 # we now weed out all tags we do not support
802 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
803 # now all entities
804 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
805
806 # handle some elements
807 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
808 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
809
810 $_
811}
812
813our %NAME_TO_COLOR = (
814 black => 0,
815 white => 1,
816 darkblue => 2,
817 red => 3,
818 orange => 4,
819 lightblue => 5,
820 darkorange => 6,
821 green => 7,
822 darkgreen => 8,
823 grey => 9,
824 brown => 10,
825 yellow => 11,
826 tan => 12,
827);
638 828
639our @CF_COLOR = ( 829our @CF_COLOR = (
640 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 830 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
641 [1.00, 1.00, 1.00], 831 [1.00, 1.00, 1.00],
642 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 832 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
650 [0.75, 0.61, 0.20], 840 [0.75, 0.61, 0.20],
651 [0.99, 0.77, 0.26], 841 [0.99, 0.77, 0.26],
652 [0.74, 0.65, 0.41], 842 [0.74, 0.65, 0.41],
653); 843);
654 844
655sub drawinfo { 845sub msg {
656 my ($self, $color, $text) = @_; 846 my ($self, $color, $type, $text, @extra) = @_;
657 847
848 $text = sanitise_xml $text;
849
850 if (my $cb = $self->{cb_msg}{$type}) {
851 $_->($self, $color, $type, $text, @extra) for values %$cb;
852 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
853 $type =~ s/-/_/g;
854 $self->{$type} = $text;
855 } else {
856 $self->logprint ("msg: ", $text);
857 return if $color < 0; # negative color == ignore if not understood
858
658 my $fg = $CF_COLOR[$color % @CF_COLOR]; 859 my $fg = $CF_COLOR[$color % @CF_COLOR];
659 860
660 $self->logprint ("info: ", $text);
661
662 ## try to create single paragraphs of multiple lines sent by the server 861 ## try to create single paragraphs of multiple lines sent by the server
663 # no longer neecssary with TRT servers 862 # no longer neecssary with TRT servers
664 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 863 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
665 864
666 $text = CFPlus::asxml $text;
667 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
668 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
669
670 ::message ({ fg => $fg, markup => $_ }) 865 ::message ({ fg => $fg, markup => $_ })
671 for split /\n/, $text; 866 for split /\n/, $text;
672 867
673 $self->{statusbox}->add ($text, 868 $self->{statusbox}->add ($text,
674 group => $text, 869 group => $text,
675 fg => $fg, 870 fg => $fg,
676 timeout => $color >= 2 ? 180 : 10, 871 timeout => $color >= 2 ? 180 : 10,
677 tooltip_font => $::FONT_FIXED, 872 tooltip_font => $::FONT_FIXED,
678 ); 873 );
679} 874 }
680
681sub drawextinfo {
682 my ($self, $color, $type, $subtype, $message) = @_;
683
684 $self->drawinfo ($color, $message);
685} 875}
686 876
687sub spell_add { 877sub spell_add {
688 my ($self, $spell) = @_; 878 my ($self, $spell) = @_;
689 879
998 1188
999 (delete $self->{npc_dialog})->destroy 1189 (delete $self->{npc_dialog})->destroy
1000 if $self->{npc_dialog}; 1190 if $self->{npc_dialog};
1001 1191
1002 $self->SUPER::destroy; 1192 $self->SUPER::destroy;
1193
1194 %$self = ();
1003} 1195}
1004 1196
1005package CFPlus::NPCDialog; 1197package CFPlus::NPCDialog;
1006 1198
1007our @ISA = 'CFPlus::UI::Toplevel'; 1199our @ISA = 'CFPlus::UI::Toplevel';
1098 1290
1099 if ($msg->{msgtype} eq "reply") { 1291 if ($msg->{msgtype} eq "reply") {
1100 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1292 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1101 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1293 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1102 1294
1103 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1295 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1104 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1296 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1105 my @link; 1297 my @link;
1106 $text =~ s{ 1298 $text =~ s{
1107 ($match) 1299 ($match)
1108 }{ 1300 }{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines