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.106 by root, Sun Apr 29 20:03:08 2007 UTC vs.
Revision 1.144 by root, Fri Aug 3 02:20:32 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,#d#
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 (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
52 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
53 my ($cap) = @_; 59 my (%cap) = @_;
54 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
55 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default; 70 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
60 73
61 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
62 my $h = int $self->{maph} * 32 / $self->{tilesize}; 75 my $h = int $self->{maph} * 32 / $self->{tilesize};
63 76
64 $self->setup_req (mapsize => "${w}x${h}"); 77 $self->setup_req (mapsize => "${w}x${h}");
65 } 78 }
79 }
80 });
81
82 $self->{json_coder}
83 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub {
85 $self->{widget}{$_[0]}
86 });
87
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
94 };
95 });
96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($info);
195 });
196
197 # destroy widgets on logout
198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
199 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy
201 for values %{delete $ws->{w} || {}};
66 } 202 }
67 }); 203 });
68 204
69 $self->{map_widget}->add_command (@$_) 205 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 206 for @cmd_help;
… …
279 my @skills = keys %{ $self->{skill_info} }; 415 my @skills = keys %{ $self->{skill_info} };
280 416
281 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 417 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
282 $sktbl->clear; 418 $sktbl->clear;
283 419
420 my @add;
421
422 push @add,
284 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 423 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
285 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 424 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
286 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 425 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
287 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 426 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
288 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 427 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
289 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 428 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
429 ;
290 430
291 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 431 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
292 432
293 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 433 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
294 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 434 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
322 } 462 }
323 463
324 1 464 1
325 }; 465 };
326 466
467 push @add,
327 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 468 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
328 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 469 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
329 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 470 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
330 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 471 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
331 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 472 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
332 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 473 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
474 ;
333 475
334 $x++ and ($x, $y) = (0, $y + 1); 476 $x++ and ($x, $y) = (0, $y + 1);
335 } 477 }
478
479 $sktbl->add_at (@add);
336 } 480 }
337 481
338 for (grep exists $stats->{$_}, @skills) { 482 for (grep exists $stats->{$_}, @skills) {
339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 483 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 484 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
577} 721}
578 722
579sub face_find { 723sub face_find {
580 my ($self, $facenum, $face, $cb) = @_; 724 my ($self, $facenum, $face, $cb) = @_;
581 725
582 my $hash = "$face->{chksum},$face->{name}"; 726 if ($face->{type} == 0) { # FT_FACE
583
584 my $id = CFPlus::DB::get_tile_id_sync $hash; 727 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
585 728
586 $face->{id} = $id; 729 $face->{id} = $id;
587 $self->{faceid}[$facenum] = $id; 730 $self->{faceid}[$facenum] = $id;
588 731
589 $self->{map}->set_tileid ($facenum => $id); 732 $self->{map}->set_tileid ($facenum => $id);
590 733
591 CFPlus::DB::get tilecache => $id, $cb; 734 CFPlus::DB::get tilecache => $id, $cb;
735
736 } elsif ($face->{type} & 1) { # with metadata
737 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
738 CFPlus::DB::get res_meta => $face->{name}, $cb;
739 }
592} 740}
593 741
594sub face_update { 742sub face_update {
595 my ($self, $facenum, $face, $changed) = @_; 743 my ($self, $facenum, $face, $changed) = @_;
596 744
745 if ($face->{type} == 0) { # FT_FACE
597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
598 if $changed; 747 if $changed;
599 748
600 $self->set_texture ($face->{id} => delete $face->{image}); 749 $self->set_texture ($face->{id} => delete $face->{data});
750
751 } elsif ($face->{type} & 1) { # split metadata
752 my $cb = sub { };
753
754 if ($face->{type} == 3) { # FT_MUSIC
755 $cb = sub {
756 $self->{music_meta}{$facenum} = $face;
757
758 ::message ({ markup => "downloaded song #$facenum" })
759 if $changed;
760
761 &::audio_music_push ($facenum);
762 };
763 } elsif ($face->{type} == 5) { # FT_SOUND
764 $cb = sub {
765 $self->{sound_meta}{$facenum} = $face;
766
767 ::message ({ markup => "downloaded sound #$facenum" })
768 if $changed;
769
770 &::audio_sound_push ($facenum);
771 };
772 }
773
774 if ($changed) { # new data
775 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
776
777 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
778 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
779 $face->{meta} = $self->{json_coder}->decode ($meta_json);
780 ::add_license ($face);
781 $cb->();
782 };
783
784 } else {
785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
786 ::add_license ($face);
787 $cb->();
788 }
789 }
601} 790}
602 791
603sub smooth_update { 792sub smooth_update {
604 my ($self, $facenum, $face) = @_; 793 my ($self, $facenum, $face) = @_;
605 794
606 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 795 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
607} 796}
608 797
609sub set_texture { 798sub set_texture {
610 my ($self, $id, $data) = @_; 799 my ($self, $id, $data) = @_;
800
801 return unless $self->{map};
611 802
612 $self->{texture}[$id] = my $tex = 803 $self->{texture}[$id] = my $tex =
613 new_from_image CFPlus::Texture 804 new_from_image CFPlus::Texture
614 $data, minify => 1, mipmap => 1; 805 $data, minify => 1, mipmap => 1;
615 806
616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 807 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
617 $self->{map_widget}->update; 808 $self->{map_widget}->update;
809
810 $_->() for @{(delete $self->{face_cb}{$id}) || []};
811}
812
813sub connect_face_update {
814 my ($self, $id, $cb) = @_;
815
816 push @{$self->{face_cb}{$id}}, $cb;
817
818 CFPlus::guard {
819 @{$self->{face_cb}{$id}}
820 = grep $_ != $cb,
821 @{$self->{face_cb}{$id}};
822 }
618} 823}
619 824
620sub sound_play { 825sub sound_play {
621 my ($self, $x, $y, $soundnum, $type) = @_; 826 my ($self, $type, $face, $dx, $dy, $vol) = @_;
622 827
623 $self->{sound_play}->($x, $y, $soundnum, $type); 828 &::audio_sound_play ($face, $dx, $dy, $vol)
829 unless $type & 1; # odd types are silent for future expansion
624} 830}
625 831
626my $LAST_QUERY; # server is stupid, stupid, stupid 832my $LAST_QUERY; # server is stupid, stupid, stupid
627 833
628sub query { 834sub query {
… …
630 836
631 $prompt = $LAST_QUERY unless length $prompt; 837 $prompt = $LAST_QUERY unless length $prompt;
632 $LAST_QUERY = $prompt; 838 $LAST_QUERY = $prompt;
633 839
634 $self->{query}-> ($self, $flags, $prompt); 840 $self->{query}-> ($self, $flags, $prompt);
841}
842
843sub sanitise_xml($) {
844 local $_ = shift;
845
846 # we now weed out all tags we do not support
847 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
848 # now all entities
849 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
850
851 # handle some elements
852 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
853 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
854
855 $_
635} 856}
636 857
637our %NAME_TO_COLOR = ( 858our %NAME_TO_COLOR = (
638 black => 0, 859 black => 0,
639 white => 1, 860 white => 1,
… …
667); 888);
668 889
669sub msg { 890sub msg {
670 my ($self, $color, $type, $text, @extra) = @_; 891 my ($self, $color, $type, $text, @extra) = @_;
671 892
893 $text = sanitise_xml $text;
894
672 if (my $cb = $self->{cb_msg}{$type}) { 895 if (my $cb = $self->{cb_msg}{$type}) {
673 $_->($self, $color, $type, $text, @extra) for values %$cb; 896 $_->($self, $color, $type, $text, @extra) for values %$cb;
674 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 897 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
675 $type =~ s/-/_/g; 898 $type =~ s/-/_/g;
676 $self->{$type} = $text; 899 $self->{$type} = $text;
677 } else { 900 } else {
678 $self->logprint ("msg: ", $text); 901 $self->logprint ("msg: ", $text);
679 return if $color < 0; # negative color == ignore if not understood 902 return if $color < 0; # negative color == ignore if not understood
680 903
681 my $fg = $CF_COLOR[$color % @CF_COLOR]; 904 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
682 905
683 ## try to create single paragraphs of multiple lines sent by the server 906 ## try to create single paragraphs of multiple lines sent by the server
684 # no longer neecssary with TRT servers 907 # no longer neecssary with TRT servers
685 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 908 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
686 909
687 ::message ({ fg => $fg, markup => $_ }) 910 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
688 for split /\n/, $text; 911 for split /\n/, $text;
689 912
690 $self->{statusbox}->add ($text, 913 $self->{statusbox}->add ($text,
691 group => $text, 914 group => $text,
692 fg => $fg, 915 fg => $fg,
… …
749 $self->{map_widget}->clr_commands; 972 $self->{map_widget}->clr_commands;
750 973
751 ::stop_game (); 974 ::stop_game ();
752} 975}
753 976
754sub image_info {
755 my ($self, $numfaces) = @_;
756
757 $self->{num_faces} = $numfaces;
758 $self->{face_prefetch} = [1 .. $numfaces];
759 $self->face_prefetch;
760}
761
762sub face_prefetch {
763 my ($self) = @_;
764
765 return unless $::CFG->{face_prefetch};
766
767 if ($self->{num_faces}) {
768 return if @{ $self->{send_queue} || [] };
769 my $todo = @{ $self->{face_prefetch} }
770 or return;
771
772 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
773
774 $self->send ("requestinfo image_sums $face $face");
775
776 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
777 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
778 } elsif (!exists $self->{num_faces}) {
779 $self->send ("requestinfo image_info");
780
781 $self->{num_faces} = 0;
782
783 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
784 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
785 }
786}
787
788sub update_floorbox { 977sub update_floorbox {
789 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 978 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
790 return unless $::CONN; 979 return unless $::CONN;
791 980
792 $::FLOORBOX->clear; 981 $::FLOORBOX->clear;
982
983 my @add;
793 984
794 my $row; 985 my $row;
795 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 986 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
796 if ($row < 6) { 987 if ($row < 6) {
797 local $_->{face_widget}; # hack to force recreation of widget 988 local $_->{face_widget}; # hack to force recreation of widget
798 local $_->{desc_widget}; # hack to force recreation of widget 989 local $_->{desc_widget}; # hack to force recreation of widget
799 CFPlus::Item::update_widgets $_; 990 CFPlus::Item::update_widgets $_;
800 991
992 push @add,
801 $::FLOORBOX->add (0, $row, $_->{face_widget}); 993 0, $row, $_->{face_widget},
802 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 994 1, $row, $_->{desc_widget};
803 995
804 $row++; 996 $row++;
805 } else { 997 } else {
806 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 998 push @add, 1, $row, new CFPlus::UI::Button
807 text => "More...", 999 text => "More...",
808 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1000 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
809 ); 1001 ;
810 last; 1002 last;
811 } 1003 }
812 } 1004 }
813 if ($::CONN->{open_container}) { 1005 if ($::CONN->{open_container}) {
814 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1006 push @add, 1, $row++, new CFPlus::UI::Button
815 text => "Close container", 1007 text => "Close container",
816 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1008 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
817 ); 1009 ;
818 } 1010 }
1011
1012 $::FLOORBOX->add_at (@add);
819 }); 1013 });
820 1014
821 $::WANT_REFRESH++; 1015 $::WANT_REFRESH++;
822} 1016}
823 1017
… …
943 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1137 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
944 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1138 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
945 . "map size $self->{mapw}×$self->{maph}\n" 1139 . "map size $self->{mapw}×$self->{maph}\n"
946 ); 1140 );
947 1141
948 ::setup_build_button ($self->{editor_support}->{builder_ui});
949} 1142}
950 1143
951sub logged_in { 1144sub logged_in {
952 my ($self) = @_; 1145 my ($self) = @_;
953 1146
954 $self->send_ext_req (cfplus_support => version => 1, sub { 1147 $self->send_ext_req (cfplus_support => version => 2, sub {
1148 my (%msg) = @_;
1149
955 $self->{cfplus_ext} = $_[0]{version}; 1150 $self->{cfplus_ext} = $msg{version};
956 $self->update_server_info; 1151 $self->update_server_info;
957 1152
958 if ($self->{cfplus_ext} >= 2) { 1153 if ($self->{cfplus_ext} >= 2) {
959 $self->send_ext_req ("editor_support", sub { 1154 $self->send_ext_req ("editor_support", sub {
960 $self->{editor_support} = $_[0]; 1155 $self->{editor_support} = { @_ };
961 $self->update_server_info; 1156 $self->update_server_info;
962 1157
963 0 1158 0
964 }); 1159 });
965 } 1160 }
… …
973 $self->send_command ("output-count $::CFG->{output_count}"); 1168 $self->send_command ("output-count $::CFG->{output_count}");
974 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1169 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
975 $self->send_command ("pickup $::CFG->{pickup}"); 1170 $self->send_command ("pickup $::CFG->{pickup}");
976} 1171}
977 1172
978sub buildat {
979 my ($self, $builditem, $x, $y) = @_;
980
981 if ($self->{cfplus_ext}) {
982 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
983 }
984}
985
986sub lookat { 1173sub lookat {
987 my ($self, $x, $y) = @_; 1174 my ($self, $x, $y) = @_;
988 1175
989 if ($self->{cfplus_ext}) { 1176 if ($self->{cfplus_ext}) {
990 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1177 $self->send_ext_req (lookat => $x, $y, sub {
991 my ($msg) = @_; 1178 my (%msg) = @_;
992 1179
993 if (exists $msg->{npc_dialog}) { 1180 if (exists $msg{npc_dialog}) {
994 # start npc chat dialog 1181 # start npc chat dialog
995 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1182 $self->{npc_dialog} = new CFPlus::NPCDialog::
996 dx => $x, 1183 token => $msg{npc_dialog},
997 dy => $y,
998 title => "$msg->{npc_dialog} (NPC)", 1184 title => "$msg{npc_dialog}[0] (NPC)",
999 conn => $self, 1185 conn => $self,
1000 ; 1186 ;
1001 } 1187 }
1002 }); 1188 });
1003 } 1189 }
… …
1010 1196
1011 (delete $self->{npc_dialog})->destroy 1197 (delete $self->{npc_dialog})->destroy
1012 if $self->{npc_dialog}; 1198 if $self->{npc_dialog};
1013 1199
1014 $self->SUPER::destroy; 1200 $self->SUPER::destroy;
1201
1202 %$self = ();
1015} 1203}
1016 1204
1017package CFPlus::NPCDialog; 1205package CFPlus::NPCDialog;
1018 1206
1019our @ISA = 'CFPlus::UI::Toplevel'; 1207our @ISA = 'CFPlus::UI::Toplevel';
… …
1066 on_activate => sub { $this->destroy; 1 }, 1254 on_activate => sub { $this->destroy; 1 },
1067 ; 1255 ;
1068 1256
1069 $self->update_options; 1257 $self->update_options;
1070 1258
1071 $self->{id} = $self->{conn}->send_ext_req ( 1259 $self->{id} = "npc-channel-" . $self->{conn}->token;
1072 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1260 $self->{conn}->connect_ext ($self->{id} => sub {
1073 sub { $this && $this->feed (@_) } 1261 $this->feed (@_) if $this;
1074 ); 1262 });
1263
1264 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1075 1265
1076 $self->{entry}->grab_focus; 1266 $self->{entry}->grab_focus;
1077 1267
1078 $self->{textview}->add_paragraph ({ 1268 $self->{textview}->add_paragraph ({
1079 fg => [1, 1, 0, 1], 1269 fg => [1, 1, 0, 1],
… …
1102 ); 1292 );
1103 } 1293 }
1104} 1294}
1105 1295
1106sub feed { 1296sub feed {
1107 my ($self, $msg) = @_; 1297 my ($self, $type, @arg) = @_;
1108 1298
1109 CFPlus::weaken $self; 1299 CFPlus::weaken $self;
1110 1300
1111 if ($msg->{msgtype} eq "reply") { 1301 if ($type eq "update") {
1302 my (%info) = @arg;
1303
1112 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1304 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1113 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1305 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1114
1115 my $text = "\n" . CFPlus::asxml $msg->{msg};
1116 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1117 my @link;
1118 $text =~ s{
1119 ($match)
1120 }{
1121 my $kw = $1;
1122
1123 push @link, new CFPlus::UI::Label
1124 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1125 can_hover => 1,
1126 can_events => 1,
1127 padding_x => 0,
1128 padding_y => 0,
1129 on_button_up => sub {
1130 $self->send ($kw);
1131 };
1132
1133 "\x{fffc}"
1134 }giex;
1135 1306
1307 if (exists $info{msg}) {
1308 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1309 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1310 my @link;
1311 $text =~ s{
1312 ($match)
1313 }{
1314 my $kw = $1;
1315
1316 push @link, new CFPlus::UI::Label
1317 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1318 can_hover => 1,
1319 can_events => 1,
1320 padding_x => 0,
1321 padding_y => 0,
1322 on_button_up => sub {
1323 $self->send ($kw);
1324 };
1325
1326 "\x{fffc}"
1327 }giex;
1328
1136 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1329 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1137 $self->{textview}->scroll_to_bottom; 1330 $self->{textview}->scroll_to_bottom;
1331 }
1332
1138 $self->update_options; 1333 $self->update_options;
1139 } else { 1334 } else {
1140 $self->destroy; 1335 $self->destroy;
1141 } 1336 }
1142 1337
… …
1147 my ($self, $msg) = @_; 1342 my ($self, $msg) = @_;
1148 1343
1149 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1344 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1150 $self->{textview}->scroll_to_bottom; 1345 $self->{textview}->scroll_to_bottom;
1151 1346
1152 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1347 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1153} 1348}
1154 1349
1155sub destroy { 1350sub destroy {
1156 my ($self) = @_; 1351 my ($self) = @_;
1157 1352
1158 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1353 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1159 1354
1160 if ($self->{conn}) { 1355 if ($self->{conn}) {
1161 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1356 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1162 delete $self->{conn}{npc_dialog}; 1357 delete $self->{conn}{npc_dialog};
1163 $self->{conn}->disconnect_ext ($self->{id}); 1358 $self->{conn}->disconnect_ext ($self->{id});
1164 } 1359 }
1165 1360
1166 $self->SUPER::destroy; 1361 $self->SUPER::destroy;

Diff Legend

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