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.101 by root, Thu Apr 12 07:53:31 2007 UTC vs.
Revision 1.117 by root, Fri Jul 13 05:31:31 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) = @_;
73
74 if (defined $meta) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
76 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1];
81
82 CFPlus::DB::write_file $chksum, $data, sub { };
83 CFPlus::DB::put "res-metadata" => $chksum => $meta, sub { };
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
86 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs});
89 });
90 }
91 }
92 }
93 }
94
95 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 }
98 });
99
51 $self->connect_ext (event_capabilities => sub { 100 $self->connect_ext (event_capabilities => sub {
52 my ($cap) = @_; 101 my ($cap) = @_;
53 102
54 if (my $ts = $cap->{tileset}) { 103 if (my $ts = $cap->{tileset}) {
55 if (my ($default) = grep $_->[2] & 1, @$ts) { 104 if (my ($default) = grep $_->[2] & 1, @$ts) {
60 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 109 my $w = int $self->{mapw} * 32 / $self->{tilesize};
61 my $h = int $self->{maph} * 32 / $self->{tilesize}; 110 my $h = int $self->{maph} * 32 / $self->{tilesize};
62 111
63 $self->setup_req (mapsize => "${w}x${h}"); 112 $self->setup_req (mapsize => "${w}x${h}");
64 } 113 }
114 }
115 });
116
117 $self->{json_coder}
118 ->convert_blessed
119 ->filter_json_single_key_object (__widget_ref__ => sub {
120 $self->{widget}{$_[0]}
121 });
122
123 $self->connect_ext (ws_n => sub {
124 my ($arg) = @_;
125
126 $self->{widgetset}{$arg{id}} = {
127 w => {},
128 };
129 });
130
131 $self->connect_ext (ws_d => sub {
132 my ($arg) = @_;
133
134 my $ws = delete $self->{widgetset}{$arg{id}}
135 or return;
136
137 $_->destroy
138 for values %{$ws->{w}};
139 });
140
141 $self->connect_ext (ws_c => sub {
142 my ($arg) = @_;
143
144 my $args = $arg->{args} || {};
145
146 for my $ev (grep /^on_/, keys %$args) {
147 $args->{$ev} = sub {
148 my $id = shift->{s_id};
149 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
150
151 1
152 };
153 }
154
155 if (my $widget = eval {
156 local $SIG{__DIE__};
157 "CFPlus::UI::$arg->{class}"->new (
158 %$args,
159 s_ws => $arg->{ws},
160 s_id => $arg->{id},
161 )
162 }
163 ) {
164 $self->{widget}{$arg->{id}}
165 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
166 = $widget;
167
168 $widget->connect (on_destroy => sub {
169 my ($widget) = @_;
170
171 delete $self->{widget}{$widget->{s_id}};
172 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
173 });
174 } else {
175 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
176 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
177 }
178 });
179
180 $self->connect_ext (w_c => sub {
181 my ($arg) = @_;
182
183 my $w = $self->{widget}{$arg->{id}}
184 or return;
185 my $m = $arg->{name};
186
187 my $a = $arg->{args} || [];
188
189 if (exists $arg->{rid}) {
190 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
191 } else {
192 $w->$m (@$a);
193 }
194 });
195
196 $self->connect_ext (w_s => sub {
197 my ($arg) = @_;
198
199 my $w = $self->{widget}{$arg->{id}}
200 or return;
201
202 $w->{$arg->{name}} = $arg->{value};
203 });
204
205 $self->connect_ext (w_g => sub {
206 my ($arg) = @_;
207
208 my $w = $self->{widget}{$arg->{id}}
209 or return;
210
211 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
212 });
213
214 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
215 for my $ws (values %{delete $self->{widgetset} || {}}) {
216 $_->destroy
217 for values %{delete $ws->{w} || {}};
65 } 218 }
66 }); 219 });
67 220
68 $self->{map_widget}->add_command (@$_) 221 $self->{map_widget}->add_command (@$_)
69 for @cmd_help; 222 for @cmd_help;
248 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 401 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
249 $::GAUGES->{food} ->set_value ($fo, $fo_m); 402 $::GAUGES->{food} ->set_value ($fo, $fo_m);
250 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 403 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
251 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 404 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
252 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 405 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
253 my $rng = $stats->{+CS_STAT_RANGE}; 406 $::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}; 407 my $title = $stats->{+CS_STAT_TITLE};
257 $title =~ s/^Player: //; 408 $title =~ s/^Player: //;
258 $::STATWIDS->{title} ->set_text ("Title: " . $title); 409 $::STATWIDS->{title} ->set_text ("Title: " . $title);
259 410
260 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 411 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
633 $LAST_QUERY = $prompt; 784 $LAST_QUERY = $prompt;
634 785
635 $self->{query}-> ($self, $flags, $prompt); 786 $self->{query}-> ($self, $flags, $prompt);
636} 787}
637 788
638sub drawinfo { 789sub sanitise_xml($) {
639 my ($self, $color, $text) = @_; 790 local $_ = shift;
640 791
641 my @color = ( 792 # we now weed out all tags we do not support
793 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
794 # now all entities
795 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
796
797 # handle some elements
798 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
799 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
800
801 $_
802}
803
804our %NAME_TO_COLOR = (
805 black => 0,
806 white => 1,
807 darkblue => 2,
808 red => 3,
809 orange => 4,
810 lightblue => 5,
811 darkorange => 6,
812 green => 7,
813 darkgreen => 8,
814 grey => 9,
815 brown => 10,
816 yellow => 11,
817 tan => 12,
818);
819
820our @CF_COLOR = (
642 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 821 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
643 [1.00, 1.00, 1.00], 822 [1.00, 1.00, 1.00],
644 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 823 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
645 [1.00, 0.00, 0.00], 824 [1.00, 0.00, 0.00],
646 [1.00, 0.54, 0.00], 825 [1.00, 0.54, 0.00],
647 [0.11, 0.56, 1.00], 826 [0.11, 0.56, 1.00],
648 [0.93, 0.46, 0.00], 827 [0.93, 0.46, 0.00],
649 [0.18, 0.54, 0.34], 828 [0.18, 0.54, 0.34],
650 [0.56, 0.73, 0.56], 829 [0.56, 0.73, 0.56],
651 [0.80, 0.80, 0.80], 830 [0.80, 0.80, 0.80],
652 [0.75, 0.61, 0.20], 831 [0.75, 0.61, 0.20],
653 [0.99, 0.77, 0.26], 832 [0.99, 0.77, 0.26],
654 [0.74, 0.65, 0.41], 833 [0.74, 0.65, 0.41],
655 ); 834);
656 835
657 my $fg = $color[$color % @color]; 836sub msg {
837 my ($self, $color, $type, $text, @extra) = @_;
658 838
839 $text = sanitise_xml $text;
840
841 if (my $cb = $self->{cb_msg}{$type}) {
842 $_->($self, $color, $type, $text, @extra) for values %$cb;
843 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
844 $type =~ s/-/_/g;
845 $self->{$type} = $text;
846 } else {
659 $self->logprint ("info: ", $text); 847 $self->logprint ("msg: ", $text);
848 return if $color < 0; # negative color == ignore if not understood
660 849
850 my $fg = $CF_COLOR[$color % @CF_COLOR];
851
661 # try to create single paragraphs of multiple lines sent by the server 852 ## try to create single paragraphs of multiple lines sent by the server
853 # no longer neecssary with TRT servers
662 $text =~ s/(?<=\S)\n(?=\w)/ /g; 854 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
663 855
664 $text = CFPlus::asxml $text;
665 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
666 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
667
668 ::message ({ fg => $fg, markup => $_ }) 856 ::message ({ fg => $fg, markup => $_ })
669 for split /\n/, $text; 857 for split /\n/, $text;
670 858
671 $self->{statusbox}->add ($text, 859 $self->{statusbox}->add ($text,
672 group => $text, 860 group => $text,
673 fg => $fg, 861 fg => $fg,
674 timeout => $color >= 2 ? 180 : 10, 862 timeout => $color >= 2 ? 180 : 10,
675 tooltip_font => $::FONT_FIXED, 863 tooltip_font => $::FONT_FIXED,
676 ); 864 );
677} 865 }
678
679sub drawextinfo {
680 my ($self, $color, $type, $subtype, $message) = @_;
681
682 $self->drawinfo ($color, $message);
683} 866}
684 867
685sub spell_add { 868sub spell_add {
686 my ($self, $spell) = @_; 869 my ($self, $spell) = @_;
687 870
920 $::SERVER_INFO->set_markup ( 1103 $::SERVER_INFO->set_markup (
921 "server <tt>$self->{host}:$self->{port}</tt>\n" 1104 "server <tt>$self->{host}:$self->{port}</tt>\n"
922 . "protocol version <tt>$self->{version}</tt>\n" 1105 . "protocol version <tt>$self->{version}</tt>\n"
923 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1106 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
924 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1107 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1108 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
925 . "editing support $yesno[!!$self->{editor_support}]\n" 1109 . "editing support $yesno[!!$self->{editor_support}]\n"
926 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1110 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1111 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
927 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1112 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
928 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1113 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
929 . "map size $self->{mapw}×$self->{maph}\n" 1114 . "map size $self->{mapw}×$self->{maph}\n"
930 ); 1115 );
931 1116
994 1179
995 (delete $self->{npc_dialog})->destroy 1180 (delete $self->{npc_dialog})->destroy
996 if $self->{npc_dialog}; 1181 if $self->{npc_dialog};
997 1182
998 $self->SUPER::destroy; 1183 $self->SUPER::destroy;
1184
1185 %$self = ();
999} 1186}
1000 1187
1001package CFPlus::NPCDialog; 1188package CFPlus::NPCDialog;
1002 1189
1003our @ISA = 'CFPlus::UI::Toplevel'; 1190our @ISA = 'CFPlus::UI::Toplevel';
1094 1281
1095 if ($msg->{msgtype} eq "reply") { 1282 if ($msg->{msgtype} eq "reply") {
1096 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1283 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1097 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1284 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1098 1285
1099 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1286 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1100 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1287 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1101 my @link; 1288 my @link;
1102 $text =~ s{ 1289 $text =~ s{
1103 ($match) 1290 ($match)
1104 }{ 1291 }{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines