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.102 by root, Wed Apr 18 18:16:16 2007 UTC vs.
Revision 1.123 by root, Thu Jul 19 16:44:14 2007 UTC

… …
20 my ($class, %arg) = @_; 20 my ($class, %arg) = @_;
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,
26 ywidget => 1,
25 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
26 }, 28 },
27 ); 29 );
28 30
29 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
46 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
47 @args 49 @args
48 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
49 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
50 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
51 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (event_capabilities => sub {
52 my ($cap) = @_; 108 my ($cap) = @_;
53 109
54 if (my $ts = $cap->{tileset}) { 110 if (my $ts = $cap->{tileset}) {
55 if (my ($default) = grep $_->[2] & 1, @$ts) { 111 if (my ($default) = grep $_->[2] & 1, @$ts) {
… …
60 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 116 my $w = int $self->{mapw} * 32 / $self->{tilesize};
61 my $h = int $self->{maph} * 32 / $self->{tilesize}; 117 my $h = int $self->{maph} * 32 / $self->{tilesize};
62 118
63 $self->setup_req (mapsize => "${w}x${h}"); 119 $self->setup_req (mapsize => "${w}x${h}");
64 } 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 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_;
133
134 $self->{widgetset}{$arg{id}} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_;
142
143 my $ws = delete $self->{widgetset}{$arg{id}}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset destroy
151 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_;
153
154 my $args = $arg->{args} || {};
155
156 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub {
158 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
160
161 1
162 };
163 }
164
165 if (my $widget = eval {
166 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new (
168 %$args,
169 s_ws => $arg->{ws},
170 s_id => $arg->{id},
171 )
172 }
173 ) {
174 $self->{widget}{$arg->{id}}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176 = $widget;
177
178 $widget->connect (on_destroy => sub {
179 my ($widget) = @_;
180
181 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 });
184 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
187 }
188 });
189
190 # widget call
191 $self->connect_ext (w_c => sub {
192 my ($arg) = @_;
193
194 my $w = $self->{widget}{$arg->{id}}
195 or return;
196 my $m = $arg->{name};
197
198 my $a = $arg->{args} || [];
199
200 if (exists $arg->{rid}) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
202 } else {
203 $w->$m (@$a);
204 }
205 });
206
207 # widget set
208 $self->connect_ext (w_s => sub {
209 my ($arg) = @_;
210
211 my $w = $self->{widget}{$arg->{id}}
212 or return;
213
214 $w->{$arg->{name}} = $arg->{value};
215 });
216
217 # widget get
218 $self->connect_ext (w_g => sub {
219 my ($arg) = @_;
220
221 my $w = $self->{widget}{$arg->{id}}
222 or return;
223
224 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
225 });
226
227 # destroy widgets on logout
228 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
229 for my $ws (values %{delete $self->{widgetset} || {}}) {
230 $_->destroy
231 for values %{delete $ws->{w} || {}};
65 } 232 }
66 }); 233 });
67 234
68 $self->{map_widget}->add_command (@$_) 235 $self->{map_widget}->add_command (@$_)
69 for @cmd_help; 236 for @cmd_help;
… …
248 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 415 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
249 $::GAUGES->{food} ->set_value ($fo, $fo_m); 416 $::GAUGES->{food} ->set_value ($fo, $fo_m);
250 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 417 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
251 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 418 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
252 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 419 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
253 my $rng = $stats->{+CS_STAT_RANGE}; 420 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
254 $rng =~ s/^Range: //; # thank you so much dear server
255 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
256 my $title = $stats->{+CS_STAT_TITLE}; 421 my $title = $stats->{+CS_STAT_TITLE};
257 $title =~ s/^Player: //; 422 $title =~ s/^Player: //;
258 $::STATWIDS->{title} ->set_text ("Title: " . $title); 423 $::STATWIDS->{title} ->set_text ("Title: " . $title);
259 424
260 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 425 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
608} 773}
609 774
610sub set_texture { 775sub set_texture {
611 my ($self, $id, $data) = @_; 776 my ($self, $id, $data) = @_;
612 777
778 return unless $self->{map};
779
613 $self->{texture}[$id] = my $tex = 780 $self->{texture}[$id] = my $tex =
614 new_from_image CFPlus::Texture 781 new_from_image CFPlus::Texture
615 $data, minify => 1, mipmap => 1; 782 $data, minify => 1, mipmap => 1;
616 783
617 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 784 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
618 $self->{map_widget}->update; 785 $self->{map_widget}->update;
786
787 $_->() for @{(delete $self->{face_cb}{$id}) || []};
788}
789
790sub connect_face_update {
791 my ($self, $id, $cb) = @_;
792
793 push @{$self->{face_cb}{$id}}, $cb;
794
795 CFPlus::guard {
796 @{$self->{face_cb}{$id}}
797 = grep $_ != $cb,
798 @{$self->{face_cb}{$id}};
799 }
619} 800}
620 801
621sub sound_play { 802sub sound_play {
622 my ($self, $x, $y, $soundnum, $type) = @_; 803 my ($self, $x, $y, $soundnum, $type) = @_;
623 804
… …
633 $LAST_QUERY = $prompt; 814 $LAST_QUERY = $prompt;
634 815
635 $self->{query}-> ($self, $flags, $prompt); 816 $self->{query}-> ($self, $flags, $prompt);
636} 817}
637 818
638sub drawinfo { 819sub sanitise_xml($) {
639 my ($self, $color, $text) = @_; 820 local $_ = shift;
640 821
641 my @color = ( 822 # we now weed out all tags we do not support
823 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
824 # now all entities
825 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
826
827 # handle some elements
828 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
829 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
830
831 $_
832}
833
834our %NAME_TO_COLOR = (
835 black => 0,
836 white => 1,
837 darkblue => 2,
838 red => 3,
839 orange => 4,
840 lightblue => 5,
841 darkorange => 6,
842 green => 7,
843 darkgreen => 8,
844 grey => 9,
845 brown => 10,
846 yellow => 11,
847 tan => 12,
848);
849
850our @CF_COLOR = (
642 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 851 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
643 [1.00, 1.00, 1.00], 852 [1.00, 1.00, 1.00],
644 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 853 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
645 [1.00, 0.00, 0.00], 854 [1.00, 0.00, 0.00],
646 [1.00, 0.54, 0.00], 855 [1.00, 0.54, 0.00],
647 [0.11, 0.56, 1.00], 856 [0.11, 0.56, 1.00],
648 [0.93, 0.46, 0.00], 857 [0.93, 0.46, 0.00],
649 [0.18, 0.54, 0.34], 858 [0.18, 0.54, 0.34],
650 [0.56, 0.73, 0.56], 859 [0.56, 0.73, 0.56],
651 [0.80, 0.80, 0.80], 860 [0.80, 0.80, 0.80],
652 [0.75, 0.61, 0.20], 861 [0.75, 0.61, 0.20],
653 [0.99, 0.77, 0.26], 862 [0.99, 0.77, 0.26],
654 [0.74, 0.65, 0.41], 863 [0.74, 0.65, 0.41],
655 ); 864);
656 865
657 my $fg = $color[$color % @color]; 866sub msg {
867 my ($self, $color, $type, $text, @extra) = @_;
658 868
869 $text = sanitise_xml $text;
870
871 if (my $cb = $self->{cb_msg}{$type}) {
872 $_->($self, $color, $type, $text, @extra) for values %$cb;
873 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
874 $type =~ s/-/_/g;
875 $self->{$type} = $text;
876 } else {
659 $self->logprint ("info: ", $text); 877 $self->logprint ("msg: ", $text);
878 return if $color < 0; # negative color == ignore if not understood
660 879
880 my $fg = $CF_COLOR[$color % @CF_COLOR];
881
661 ## try to create single paragraphs of multiple lines sent by the server 882 ## try to create single paragraphs of multiple lines sent by the server
662 # no longer neecssary with TRT servers 883 # no longer neecssary with TRT servers
663 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 884 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
664 885
665 $text = CFPlus::asxml $text;
666 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
667 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
668
669 ::message ({ fg => $fg, markup => $_ }) 886 ::message ({ fg => $fg, markup => $_ })
670 for split /\n/, $text; 887 for split /\n/, $text;
671 888
672 $self->{statusbox}->add ($text, 889 $self->{statusbox}->add ($text,
673 group => $text, 890 group => $text,
674 fg => $fg, 891 fg => $fg,
675 timeout => $color >= 2 ? 180 : 10, 892 timeout => $color >= 2 ? 180 : 10,
676 tooltip_font => $::FONT_FIXED, 893 tooltip_font => $::FONT_FIXED,
677 ); 894 );
678} 895 }
679
680sub drawextinfo {
681 my ($self, $color, $type, $subtype, $message) = @_;
682
683 $self->drawinfo ($color, $message);
684} 896}
685 897
686sub spell_add { 898sub spell_add {
687 my ($self, $spell) = @_; 899 my ($self, $spell) = @_;
688 900
… …
921 $::SERVER_INFO->set_markup ( 1133 $::SERVER_INFO->set_markup (
922 "server <tt>$self->{host}:$self->{port}</tt>\n" 1134 "server <tt>$self->{host}:$self->{port}</tt>\n"
923 . "protocol version <tt>$self->{version}</tt>\n" 1135 . "protocol version <tt>$self->{version}</tt>\n"
924 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1136 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
925 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1137 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1138 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
926 . "editing support $yesno[!!$self->{editor_support}]\n" 1139 . "editing support $yesno[!!$self->{editor_support}]\n"
927 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1140 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1141 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
928 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1142 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
929 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1143 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
930 . "map size $self->{mapw}×$self->{maph}\n" 1144 . "map size $self->{mapw}×$self->{maph}\n"
931 ); 1145 );
932 1146
… …
995 1209
996 (delete $self->{npc_dialog})->destroy 1210 (delete $self->{npc_dialog})->destroy
997 if $self->{npc_dialog}; 1211 if $self->{npc_dialog};
998 1212
999 $self->SUPER::destroy; 1213 $self->SUPER::destroy;
1214
1215 %$self = ();
1000} 1216}
1001 1217
1002package CFPlus::NPCDialog; 1218package CFPlus::NPCDialog;
1003 1219
1004our @ISA = 'CFPlus::UI::Toplevel'; 1220our @ISA = 'CFPlus::UI::Toplevel';
… …
1095 1311
1096 if ($msg->{msgtype} eq "reply") { 1312 if ($msg->{msgtype} eq "reply") {
1097 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1313 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1098 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1314 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1099 1315
1100 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1316 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1101 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1317 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1102 my @link; 1318 my @link;
1103 $text =~ s{ 1319 $text =~ s{
1104 ($match) 1320 ($match)
1105 }{ 1321 }{

Diff Legend

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