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.128 by root, Mon Jul 23 21:03:26 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 (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 (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) {
56 $self->{tileset} = $default; 112 $self->{tileset} = $default;
57 $self->{tilesize} = $default->[3]; 113 $self->{tilesize} = $default->[3];
58 $self->setup_req (tileset => $default->[0]); 114 $self->setup_req (tileset => $default->[0]);
59 115
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 my $attr = $arg->{attr};
215
216 for (my $i = 0; $i < $#$attr; $i += 2) {
217 my ($member, $value) = @$attr[$i, $i+1];
218 if (defined $value) {
219 $w->{$member} = $value;
220 } else {
221 delete $w->{$member};
222 }
223 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
224 }
225 });
226
227 # widget get
228 $self->connect_ext (w_g => sub {
229 my ($arg) = @_;
230
231 my $w = $self->{widget}{$arg->{id}}
232 or return;
233
234 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]);
235 });
236
237 # destroy widgets on logout
238 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
239 for my $ws (values %{delete $self->{widgetset} || {}}) {
240 $_->destroy
241 for values %{delete $ws->{w} || {}};
65 } 242 }
66 }); 243 });
67 244
68 $self->{map_widget}->add_command (@$_) 245 $self->{map_widget}->add_command (@$_)
69 for @cmd_help; 246 for @cmd_help;
… …
248 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 425 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
249 $::GAUGES->{food} ->set_value ($fo, $fo_m); 426 $::GAUGES->{food} ->set_value ($fo, $fo_m);
250 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 427 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
251 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 428 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
252 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 429 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
253 my $rng = $stats->{+CS_STAT_RANGE}; 430 $::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}; 431 my $title = $stats->{+CS_STAT_TITLE};
257 $title =~ s/^Player: //; 432 $title =~ s/^Player: //;
258 $::STATWIDS->{title} ->set_text ("Title: " . $title); 433 $::STATWIDS->{title} ->set_text ("Title: " . $title);
259 434
260 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 435 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
280 my @skills = keys %{ $self->{skill_info} }; 455 my @skills = keys %{ $self->{skill_info} };
281 456
282 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 457 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
283 $sktbl->clear; 458 $sktbl->clear;
284 459
460 my @add;
461
462 push @add,
285 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 463 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
286 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 464 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
287 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 465 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
288 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 466 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
289 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 467 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
290 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 468 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
469 ;
291 470
292 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 471 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
293 472
294 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 473 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
295 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 474 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
323 } 502 }
324 503
325 1 504 1
326 }; 505 };
327 506
507 push @add,
328 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 508 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
329 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 509 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
330 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 510 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
331 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 511 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
332 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 512 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
333 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 513 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
514 ;
334 515
335 $x++ and ($x, $y) = (0, $y + 1); 516 $x++ and ($x, $y) = (0, $y + 1);
336 } 517 }
518
519 $sktbl->add_at (@add);
337 } 520 }
338 521
339 for (grep exists $stats->{$_}, @skills) { 522 for (grep exists $stats->{$_}, @skills) {
340 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 523 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
341 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 524 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
608} 791}
609 792
610sub set_texture { 793sub set_texture {
611 my ($self, $id, $data) = @_; 794 my ($self, $id, $data) = @_;
612 795
796 return unless $self->{map};
797
613 $self->{texture}[$id] = my $tex = 798 $self->{texture}[$id] = my $tex =
614 new_from_image CFPlus::Texture 799 new_from_image CFPlus::Texture
615 $data, minify => 1, mipmap => 1; 800 $data, minify => 1, mipmap => 1;
616 801
617 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 802 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
618 $self->{map_widget}->update; 803 $self->{map_widget}->update;
804
805 $_->() for @{(delete $self->{face_cb}{$id}) || []};
806}
807
808sub connect_face_update {
809 my ($self, $id, $cb) = @_;
810
811 push @{$self->{face_cb}{$id}}, $cb;
812
813 CFPlus::guard {
814 @{$self->{face_cb}{$id}}
815 = grep $_ != $cb,
816 @{$self->{face_cb}{$id}};
817 }
619} 818}
620 819
621sub sound_play { 820sub sound_play {
622 my ($self, $x, $y, $soundnum, $type) = @_; 821 my ($self, $x, $y, $soundnum, $type) = @_;
623 822
… …
633 $LAST_QUERY = $prompt; 832 $LAST_QUERY = $prompt;
634 833
635 $self->{query}-> ($self, $flags, $prompt); 834 $self->{query}-> ($self, $flags, $prompt);
636} 835}
637 836
638sub drawinfo { 837sub sanitise_xml($) {
639 my ($self, $color, $text) = @_; 838 local $_ = shift;
640 839
641 my @color = ( 840 # we now weed out all tags we do not support
841 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
842 # now all entities
843 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
844
845 # handle some elements
846 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
847 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
848
849 $_
850}
851
852our %NAME_TO_COLOR = (
853 black => 0,
854 white => 1,
855 darkblue => 2,
856 red => 3,
857 orange => 4,
858 lightblue => 5,
859 darkorange => 6,
860 green => 7,
861 darkgreen => 8,
862 grey => 9,
863 brown => 10,
864 yellow => 11,
865 tan => 12,
866);
867
868our @CF_COLOR = (
642 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 869 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
643 [1.00, 1.00, 1.00], 870 [1.00, 1.00, 1.00],
644 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 871 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
645 [1.00, 0.00, 0.00], 872 [1.00, 0.00, 0.00],
646 [1.00, 0.54, 0.00], 873 [1.00, 0.54, 0.00],
647 [0.11, 0.56, 1.00], 874 [0.11, 0.56, 1.00],
648 [0.93, 0.46, 0.00], 875 [0.93, 0.46, 0.00],
649 [0.18, 0.54, 0.34], 876 [0.18, 0.54, 0.34],
650 [0.56, 0.73, 0.56], 877 [0.56, 0.73, 0.56],
651 [0.80, 0.80, 0.80], 878 [0.80, 0.80, 0.80],
652 [0.75, 0.61, 0.20], 879 [0.75, 0.61, 0.20],
653 [0.99, 0.77, 0.26], 880 [0.99, 0.77, 0.26],
654 [0.74, 0.65, 0.41], 881 [0.74, 0.65, 0.41],
655 ); 882);
656 883
657 my $fg = $color[$color % @color]; 884sub msg {
885 my ($self, $color, $type, $text, @extra) = @_;
658 886
887 $text = sanitise_xml $text;
888
889 if (my $cb = $self->{cb_msg}{$type}) {
890 $_->($self, $color, $type, $text, @extra) for values %$cb;
891 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
892 $type =~ s/-/_/g;
893 $self->{$type} = $text;
894 } else {
659 $self->logprint ("info: ", $text); 895 $self->logprint ("msg: ", $text);
896 return if $color < 0; # negative color == ignore if not understood
660 897
898 my $fg = $CF_COLOR[$color % @CF_COLOR];
899
661 ## try to create single paragraphs of multiple lines sent by the server 900 ## try to create single paragraphs of multiple lines sent by the server
662 # no longer neecssary with TRT servers 901 # no longer neecssary with TRT servers
663 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 902 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
664 903
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 => $_ }) 904 ::message ({ fg => $fg, markup => $_ })
670 for split /\n/, $text; 905 for split /\n/, $text;
671 906
672 $self->{statusbox}->add ($text, 907 $self->{statusbox}->add ($text,
673 group => $text, 908 group => $text,
674 fg => $fg, 909 fg => $fg,
675 timeout => $color >= 2 ? 180 : 10, 910 timeout => $color >= 2 ? 180 : 10,
676 tooltip_font => $::FONT_FIXED, 911 tooltip_font => $::FONT_FIXED,
677 ); 912 );
678} 913 }
679
680sub drawextinfo {
681 my ($self, $color, $type, $subtype, $message) = @_;
682
683 $self->drawinfo ($color, $message);
684} 914}
685 915
686sub spell_add { 916sub spell_add {
687 my ($self, $spell) = @_; 917 my ($self, $spell) = @_;
688 918
… …
776 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1006 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
777 return unless $::CONN; 1007 return unless $::CONN;
778 1008
779 $::FLOORBOX->clear; 1009 $::FLOORBOX->clear;
780 1010
1011 my @add;
1012
781 my $row; 1013 my $row;
782 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1014 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
783 if ($row < 6) { 1015 if ($row < 6) {
784 local $_->{face_widget}; # hack to force recreation of widget 1016 local $_->{face_widget}; # hack to force recreation of widget
785 local $_->{desc_widget}; # hack to force recreation of widget 1017 local $_->{desc_widget}; # hack to force recreation of widget
786 CFPlus::Item::update_widgets $_; 1018 CFPlus::Item::update_widgets $_;
787 1019
1020 push @add,
788 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1021 0, $row, $_->{face_widget},
789 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1022 1, $row, $_->{desc_widget};
790 1023
791 $row++; 1024 $row++;
792 } else { 1025 } else {
793 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1026 push @add, 1, $row, new CFPlus::UI::Button
794 text => "More...", 1027 text => "More...",
795 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1028 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
796 ); 1029 ;
797 last; 1030 last;
798 } 1031 }
799 } 1032 }
800 if ($::CONN->{open_container}) { 1033 if ($::CONN->{open_container}) {
801 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1034 push @add, 1, $row++, new CFPlus::UI::Button
802 text => "Close container", 1035 text => "Close container",
803 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1036 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
804 ); 1037 ;
805 } 1038 }
1039
1040 $::FLOORBOX->add_at (@add);
806 }); 1041 });
807 1042
808 $::WANT_REFRESH++; 1043 $::WANT_REFRESH++;
809} 1044}
810 1045
… …
921 $::SERVER_INFO->set_markup ( 1156 $::SERVER_INFO->set_markup (
922 "server <tt>$self->{host}:$self->{port}</tt>\n" 1157 "server <tt>$self->{host}:$self->{port}</tt>\n"
923 . "protocol version <tt>$self->{version}</tt>\n" 1158 . "protocol version <tt>$self->{version}</tt>\n"
924 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1159 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
925 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1160 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1161 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
926 . "editing support $yesno[!!$self->{editor_support}]\n" 1162 . "editing support $yesno[!!$self->{editor_support}]\n"
927 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1163 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1164 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
928 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1165 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
929 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1166 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
930 . "map size $self->{mapw}×$self->{maph}\n" 1167 . "map size $self->{mapw}×$self->{maph}\n"
931 ); 1168 );
932 1169
… …
934} 1171}
935 1172
936sub logged_in { 1173sub logged_in {
937 my ($self) = @_; 1174 my ($self) = @_;
938 1175
939 $self->send_ext_req (cfplus_support => version => 1, sub { 1176 $self->send_ext_req (cfplus_support => version => 2, sub {
1177 my (%msg) = @_;
1178
940 $self->{cfplus_ext} = $_[0]{version}; 1179 $self->{cfplus_ext} = $msg{version};
941 $self->update_server_info; 1180 $self->update_server_info;
942 1181
943 if ($self->{cfplus_ext} >= 2) { 1182 if ($self->{cfplus_ext} >= 2) {
944 $self->send_ext_req ("editor_support", sub { 1183 $self->send_ext_req ("editor_support", sub {
945 $self->{editor_support} = $_[0]; 1184 $self->{editor_support} = { @_ };
946 $self->update_server_info; 1185 $self->update_server_info;
947 1186
948 0 1187 0
949 }); 1188 });
950 } 1189 }
… …
970 1209
971sub lookat { 1210sub lookat {
972 my ($self, $x, $y) = @_; 1211 my ($self, $x, $y) = @_;
973 1212
974 if ($self->{cfplus_ext}) { 1213 if ($self->{cfplus_ext}) {
975 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1214 $self->send_ext_req (lookat => $x, $y, sub {
976 my ($msg) = @_; 1215 my (%msg) = @_;
977 1216
978 if (exists $msg->{npc_dialog}) { 1217 if (exists $msg{npc_dialog}) {
979 # start npc chat dialog 1218 # start npc chat dialog
980 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1219 $self->{npc_dialog} = new CFPlus::NPCDialog::
981 dx => $x, 1220 token => $msg{npc_dialog},
982 dy => $y,
983 title => "$msg->{npc_dialog} (NPC)", 1221 title => "$msg{npc_dialog}[0] (NPC)",
984 conn => $self, 1222 conn => $self,
985 ; 1223 ;
986 } 1224 }
987 }); 1225 });
988 } 1226 }
… …
995 1233
996 (delete $self->{npc_dialog})->destroy 1234 (delete $self->{npc_dialog})->destroy
997 if $self->{npc_dialog}; 1235 if $self->{npc_dialog};
998 1236
999 $self->SUPER::destroy; 1237 $self->SUPER::destroy;
1238
1239 %$self = ();
1000} 1240}
1001 1241
1002package CFPlus::NPCDialog; 1242package CFPlus::NPCDialog;
1003 1243
1004our @ISA = 'CFPlus::UI::Toplevel'; 1244our @ISA = 'CFPlus::UI::Toplevel';
… …
1051 on_activate => sub { $this->destroy; 1 }, 1291 on_activate => sub { $this->destroy; 1 },
1052 ; 1292 ;
1053 1293
1054 $self->update_options; 1294 $self->update_options;
1055 1295
1056 $self->{id} = $self->{conn}->send_ext_req ( 1296 $self->{id} = "npc-channel-" . $self->{conn}->token;
1057 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1297 $self->{conn}->connect_ext ($self->{id} => sub {
1058 sub { $this && $this->feed (@_) } 1298 $this->feed (@_) if $this;
1059 ); 1299 });
1300
1301 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1060 1302
1061 $self->{entry}->grab_focus; 1303 $self->{entry}->grab_focus;
1062 1304
1063 $self->{textview}->add_paragraph ({ 1305 $self->{textview}->add_paragraph ({
1064 fg => [1, 1, 0, 1], 1306 fg => [1, 1, 0, 1],
… …
1087 ); 1329 );
1088 } 1330 }
1089} 1331}
1090 1332
1091sub feed { 1333sub feed {
1092 my ($self, $msg) = @_; 1334 my ($self, $type, @arg) = @_;
1093 1335
1094 CFPlus::weaken $self; 1336 CFPlus::weaken $self;
1095 1337
1096 if ($msg->{msgtype} eq "reply") { 1338 if ($type eq "update") {
1339 my (%info) = @arg;
1340
1097 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1341 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1098 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1342 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1099
1100 my $text = "\n" . CFPlus::asxml $msg->{msg};
1101 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1102 my @link;
1103 $text =~ s{
1104 ($match)
1105 }{
1106 my $kw = $1;
1107
1108 push @link, new CFPlus::UI::Label
1109 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1110 can_hover => 1,
1111 can_events => 1,
1112 padding_x => 0,
1113 padding_y => 0,
1114 on_button_up => sub {
1115 $self->send ($kw);
1116 };
1117
1118 "\x{fffc}"
1119 }giex;
1120 1343
1344 if (exists $info{msg}) {
1345 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1346 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1347 my @link;
1348 $text =~ s{
1349 ($match)
1350 }{
1351 my $kw = $1;
1352
1353 push @link, new CFPlus::UI::Label
1354 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1355 can_hover => 1,
1356 can_events => 1,
1357 padding_x => 0,
1358 padding_y => 0,
1359 on_button_up => sub {
1360 $self->send ($kw);
1361 };
1362
1363 "\x{fffc}"
1364 }giex;
1365
1121 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1366 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1122 $self->{textview}->scroll_to_bottom; 1367 $self->{textview}->scroll_to_bottom;
1368 }
1369
1123 $self->update_options; 1370 $self->update_options;
1124 } else { 1371 } else {
1125 $self->destroy; 1372 $self->destroy;
1126 } 1373 }
1127 1374
… …
1132 my ($self, $msg) = @_; 1379 my ($self, $msg) = @_;
1133 1380
1134 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1381 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1135 $self->{textview}->scroll_to_bottom; 1382 $self->{textview}->scroll_to_bottom;
1136 1383
1137 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1384 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1138} 1385}
1139 1386
1140sub destroy { 1387sub destroy {
1141 my ($self) = @_; 1388 my ($self) = @_;
1142 1389
1143 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1390 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1144 1391
1145 if ($self->{conn}) { 1392 if ($self->{conn}) {
1146 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1393 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1147 delete $self->{conn}{npc_dialog}; 1394 delete $self->{conn}{npc_dialog};
1148 $self->{conn}->disconnect_ext ($self->{id}); 1395 $self->{conn}->disconnect_ext ($self->{id});
1149 } 1396 }
1150 1397
1151 $self->SUPER::destroy; 1398 $self->SUPER::destroy;

Diff Legend

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