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.124 by root, Fri Jul 20 16:32:04 2007 UTC vs.
Revision 1.151 by root, Sun Aug 12 09:39:49 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 ywidget => 1,#d#
27 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
28 }, 28 },
29 ); 29 );
30 30
31 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
48 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
49 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
52 52
53 $self->connect_ext (event_music => sub { 53 $self->connect_ext (ambient_music => sub {
54 my ($ev) = @_; 54 my ($songs) = @_;
55 55 &::audio_music_set_ambient ($songs);
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 }); 56 });
106 57
107 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
108 my ($cap) = @_; 59 my (%cap) = @_;
109 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
110 if (my $ts = $cap->{tileset}) { 64 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) { 65 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default; 66 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3]; 67 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]); 68 $self->setup_req (tileset => $default->[0]);
115 69
… …
121 } 75 }
122 }); 76 });
123 77
124 $self->{json_coder} 78 $self->{json_coder}
125 ->convert_blessed 79 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 80 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]} 81 $self->{widget}{$_[0]}
128 }); 82 });
129 83
130 # widgetset new 84 # widgetset new
131 $self->connect_ext (ws_n => sub { 85 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_; 86 my ($id) = @_;
133 87
134 $self->{widgetset}{$arg{id}} = { 88 $self->{widgetset}{$id} = {
135 w => {}, 89 w => {},
136 }; 90 };
137 }); 91 });
138 92
139 # widgetset destroy 93 # widgetset destroy
140 $self->connect_ext (ws_d => sub { 94 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_; 95 my ($id) = @_;
142 96
143 my $ws = delete $self->{widgetset}{$arg{id}} 97 my $ws = delete $self->{widgetset}{$id}
144 or return; 98 or return;
145 99
146 $_->destroy 100 $_->destroy
147 for values %{$ws->{w}}; 101 for values %{$ws->{w}};
148 }); 102 });
149 103
150 # widgetset destroy 104 # widgetset create
151 $self->connect_ext (ws_c => sub { 105 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_; 106 my ($ws, $id, $class, $args) = @_;
153
154 my $args = $arg->{args} || {};
155 107
156 for my $ev (grep /^on_/, keys %$args) { 108 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub { 109 $args->{$ev} = sub {
158 my $id = shift->{s_id}; 110 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 111 $self->send_exti_msg (w_e => $id, $ev, \@_);
160 112
161 1 113 1
162 }; 114 };
163 } 115 }
164 116
165 if (my $widget = eval { 117 if (my $widget = eval {
166 local $SIG{__DIE__}; 118 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new ( 119 "CFPlus::UI::$class"->new (
168 %$args, 120 %$args,
169 s_ws => $arg->{ws}, 121 s_ws => $ws,
170 s_id => $arg->{id}, 122 s_id => $id,
171 ) 123 )
172 } 124 }
173 ) { 125 ) {
174 $self->{widget}{$arg->{id}} 126 $self->{widget}{$id}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 127 = $self->{widgetset}{$ws}{w}{$id}
176 = $widget; 128 = $widget;
177 129
178 $widget->connect (on_destroy => sub { 130 $widget->connect (on_destroy => sub {
179 my ($widget) = @_; 131 my ($widget) = @_;
180 132
181 delete $self->{widget}{$widget->{s_id}}; 133 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 }); 135 });
184 } else { 136 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 137 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 138 $self->send_exti_msg (w_e => $id, "destroy");
187 } 139 }
188 }); 140 });
189 141
190 # widget call 142 # widget call
191 $self->connect_ext (w_c => sub { 143 $self->connect_ext (w_c => sub {
192 my ($arg) = @_; 144 my ($id, $rid, $method, $args) = @_;
193 145
194 my $w = $self->{widget}{$arg->{id}} 146 my $w = $self->{widget}{$id}
195 or return; 147 or return;
196 my $m = $arg->{name};
197 148
198 my $a = $arg->{args} || []; 149 $args ||= [];
199 150
200 if (exists $arg->{rid}) { 151 if ($rid) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
202 } else { 153 } else {
203 $w->$m (@$a); 154 $w->$method (@$args);
204 } 155 }
205 }); 156 });
206 157
207 # widget set 158 # widget set
208 $self->connect_ext (w_s => sub { 159 $self->connect_ext (w_s => sub {
209 my ($arg) = @_; 160 my ($id, $attr) = @_;
210 161
211 my $w = $self->{widget}{$arg->{id}} 162 my $w = $self->{widget}{$id}
212 or return; 163 or return;
213 164
214 $w->{$arg->{name}} = $arg->{value}; 165 for (my $i = 0; $i < $#$attr; $i += 2) {
166 my ($member, $value) = @$attr[$i, $i+1];
167 if (defined $value) {
168 $w->{$member} = $value;
169 } else {
170 delete $w->{$member};
171 }
172 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
173 }
215 }); 174 });
216 175
217 # widget get 176 # widget get
218 $self->connect_ext (w_g => sub { 177 $self->connect_ext (w_g => sub {
219 my ($arg) = @_; 178 my ($id, $rid, $attr) = @_;
220 179
221 my $w = $self->{widget}{$arg->{id}} 180 my $w = $self->{widget}{$id}
222 or return; 181 or return;
223 182
224 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
184 });
185
186 # message window
187 $self->connect_ext (channel_info => sub {
188 my ($info) = @_;
189 $self->{channels}->{$info->{id}} = $info;
190 $::MESSAGE_WINDOW->add_channel ($info);
225 }); 191 });
226 192
227 # destroy widgets on logout 193 # destroy widgets on logout
228 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 194 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
229 for my $ws (values %{delete $self->{widgetset} || {}}) { 195 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
253 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
254 220
255 $self 221 $self
256} 222}
257 223
224sub update_fx_want {
225 my ($self) = @_;
226
227 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND
230 });
231}
232
258sub logprint { 233sub logprint {
259 my ($self, @a) = @_; 234 my ($self, @a) = @_;
260 235
261 $self->{log_fh} ||= do { 236 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
262 my $path = "$Crossfire::VARDIR/log.$self->{host}";
263
264 open my $fh, ">>:utf8", $path
265 or die "Couldn't open logfile $path: $!";
266
267 $fh->autoflush (1);
268
269 $fh;
270 };
271
272 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
273
274 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
275 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
276
277 print {$self->{log_fh}} "$ts ", @a, "\n";
278} 237}
279 238
280sub _stat_numdiff { 239sub _stat_numdiff {
281 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
282 241
… …
547} 506}
548 507
549sub feed_map1a { 508sub feed_map1a {
550 my ($self, $data) = @_; 509 my ($self, $data) = @_;
551 510
552 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 511 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
512 my $delay;
513
514 for my $tile (@$missing) {
515 next if $self->{delay}{$tile};
516
517 $delay = 1;
518
519 if (my $tex = $::CONN->{texture}[$tile]) {
520 $tex->upload;
521 } else {
522 $self->{delay}{$tile} = 1;
523
524 # we assume the face is in-flight and will eventually come
525 push @{$self->{face_cb}{$tile}}, sub {
526 delete $self->{delay}{$tile};
527 $_[0]->upload;
528 };
529 }
530 }
531
532 if ($delay) {
533 # delay the map drawing a tiny bit in the hope of getting the missing fetched
534 Event->timer (after => 0.03, cb => sub {
535 $_[0]->w->cancel;
536 $self->{map_widget}->update;
537 });
538 } else {
553 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
554} 541}
555 542
556sub magicmap { 543sub magicmap {
557 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
558 545
… …
590 do { 577 do {
591 $id = pop @{$self->{bg_fetch}} 578 $id = pop @{$self->{bg_fetch}}
592 or return; 579 or return;
593 } while $self->{texture}[$id]; 580 } while $self->{texture}[$id];
594 581
595 CFPlus::DB::get tilecache => $id, sub { 582 CFPlus::DB::exists tilecache => $id, sub {
596 my ($data) = @_; 583 my ($exists) = @_;
597 584
598 return unless $self->{map}; # stop when destroyed 585 return unless $self->{map}; # stop when destroyed
599 586
600 $self->set_texture ($id => $data) 587 if ($exists) {
601 if defined $data; 588 $self->have_tile ($id);
589 $self->{texture}[$id]->upload;
590 }
602 591
603 $self->bg_fetch; 592 $self->bg_fetch;
604 }; 593 };
605} 594}
606 595
… …
751} 740}
752 741
753sub face_find { 742sub face_find {
754 my ($self, $facenum, $face, $cb) = @_; 743 my ($self, $facenum, $face, $cb) = @_;
755 744
756 my $hash = "$face->{chksum},$face->{name}"; 745 if ($face->{type} == 0) { # FT_FACE
757
758 my $id = CFPlus::DB::get_tile_id_sync $hash; 746 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
759 747
760 $face->{id} = $id; 748 $face->{id} = $id;
761 $self->{faceid}[$facenum] = $id; 749 $self->{faceid}[$facenum] = $id;
762 750
763 $self->{map}->set_tileid ($facenum => $id); 751 $self->{map}->set_tileid ($facenum => $id);
764 752
765 CFPlus::DB::get tilecache => $id, $cb; 753 CFPlus::DB::get tilecache => $id, $cb;
754
755 } elsif ($face->{type} & 1) { # with metadata
756 CFPlus::DB::get res_meta => $face->{name}, $cb;
757 }
766} 758}
767 759
768sub face_update { 760sub face_update {
769 my ($self, $facenum, $face, $changed) = @_; 761 my ($self, $facenum, $face, $changed) = @_;
770 762
763 if ($face->{type} == 0) { # FT_FACE
771 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 764 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
772 if $changed; 765 if $changed;
773 766
774 $self->set_texture ($face->{id} => delete $face->{image}); 767 $self->have_tile ($face->{id});
768
769 } elsif ($face->{type} & 1) { # split metadata
770 if ($changed) { # new data
771 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
772 $face->{meta} = $self->{json_coder}->decode ($meta_json);
773
774 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
775 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
776 } else {
777 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
778 }
779
780 ::add_license ($face);
781
782 if ($face->{type} == 3) { # FT_MUSIC
783 $self->{music_meta}{$facenum} = $face;
784
785 ::message ({ markup => "downloaded song #$facenum" })
786 if $changed;
787
788 &::audio_music_push ($facenum);
789 } elsif ($face->{type} == 5) { # FT_SOUND
790 $self->{sound_meta}{$facenum} = $face;
791
792 ::message ({ markup => "downloaded sound #$facenum" })
793 if $changed;
794
795 &::audio_sound_push ($facenum);
796 }
797
798 }
775} 799}
776 800
777sub smooth_update { 801sub smooth_update {
778 my ($self, $facenum, $face) = @_; 802 my ($self, $facenum, $face) = @_;
779 803
780 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 804 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
781} 805}
782 806
783sub set_texture { 807sub have_tile {
784 my ($self, $id, $data) = @_; 808 my ($self, $tile) = @_;
785 809
786 return unless $self->{map}; 810 return unless $self->{map};
787 811
788 $self->{texture}[$id] = my $tex = 812 my $tex = $self->{texture}[$tile] ||=
789 new_from_image CFPlus::Texture 813 new CFPlus::Texture
790 $data, minify => 1, mipmap => 1; 814 tile => $tile, minify => 1, mipmap => 1, delay => 1;
791 815
792 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
793 $self->{map_widget}->update;
794
795 $_->() for @{(delete $self->{face_cb}{$id}) || []}; 816 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
796} 817}
797 818
798sub connect_face_update { 819sub connect_face_update {
799 my ($self, $id, $cb) = @_; 820 my ($self, $id, $cb) = @_;
800 821
… …
806 @{$self->{face_cb}{$id}}; 827 @{$self->{face_cb}{$id}};
807 } 828 }
808} 829}
809 830
810sub sound_play { 831sub sound_play {
811 my ($self, $x, $y, $soundnum, $type) = @_; 832 my ($self, $type, $face, $dx, $dy, $vol) = @_;
812 833
813 $self->{sound_play}->($x, $y, $soundnum, $type); 834 &::audio_sound_play ($face, $dx, $dy, $vol)
835 unless $type & 1; # odd types are silent for future expansion
814} 836}
815 837
816my $LAST_QUERY; # server is stupid, stupid, stupid 838my $LAST_QUERY; # server is stupid, stupid, stupid
817 839
818sub query { 840sub query {
… …
883 $self->{$type} = $text; 905 $self->{$type} = $text;
884 } else { 906 } else {
885 $self->logprint ("msg: ", $text); 907 $self->logprint ("msg: ", $text);
886 return if $color < 0; # negative color == ignore if not understood 908 return if $color < 0; # negative color == ignore if not understood
887 909
888 my $fg = $CF_COLOR[$color % @CF_COLOR]; 910 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
889 911
890 ## try to create single paragraphs of multiple lines sent by the server 912 ## try to create single paragraphs of multiple lines sent by the server
891 # no longer neecssary with TRT servers 913 # no longer neecssary with TRT servers
892 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 914 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
893 915
894 ::message ({ fg => $fg, markup => $_ }) 916 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
895 for split /\n/, $text; 917 for split /\n/, $text;
896 918
897 $self->{statusbox}->add ($text, 919 $self->{statusbox}->add ($text,
898 group => $text, 920 group => $text,
899 fg => $fg, 921 fg => $fg,
… …
956 $self->{map_widget}->clr_commands; 978 $self->{map_widget}->clr_commands;
957 979
958 ::stop_game (); 980 ::stop_game ();
959} 981}
960 982
961sub image_info {
962 my ($self, $numfaces) = @_;
963
964 $self->{num_faces} = $numfaces;
965 $self->{face_prefetch} = [1 .. $numfaces];
966 $self->face_prefetch;
967}
968
969sub face_prefetch {
970 my ($self) = @_;
971
972 return unless $::CFG->{face_prefetch};
973
974 if ($self->{num_faces}) {
975 return if @{ $self->{send_queue} || [] };
976 my $todo = @{ $self->{face_prefetch} }
977 or return;
978
979 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
980
981 $self->send ("requestinfo image_sums $face $face");
982
983 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
984 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
985 } elsif (!exists $self->{num_faces}) {
986 $self->send ("requestinfo image_info");
987
988 $self->{num_faces} = 0;
989
990 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
991 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
992 }
993}
994
995sub update_floorbox { 983sub update_floorbox {
996 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 984 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
997 return unless $::CONN; 985 return unless $::CONN;
998 986
999 $::FLOORBOX->clear; 987 $::FLOORBOX->clear;
… …
1028 } 1016 }
1029 1017
1030 $::FLOORBOX->add_at (@add); 1018 $::FLOORBOX->add_at (@add);
1031 }); 1019 });
1032 1020
1033 $::WANT_REFRESH++; 1021 $::WANT_REFRESH->start;
1034} 1022}
1035 1023
1036sub set_opencont { 1024sub set_opencont {
1037 my ($conn, $tag, $name) = @_; 1025 my ($conn, $tag, $name) = @_;
1038 $conn->{open_container} = $tag; 1026 $conn->{open_container} = $tag;
… …
1155 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1143 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1156 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1144 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1157 . "map size $self->{mapw}×$self->{maph}\n" 1145 . "map size $self->{mapw}×$self->{maph}\n"
1158 ); 1146 );
1159 1147
1160 ::setup_build_button ($self->{editor_support}->{builder_ui});
1161} 1148}
1162 1149
1163sub logged_in { 1150sub logged_in {
1164 my ($self) = @_; 1151 my ($self) = @_;
1165 1152
1166 $self->send_ext_req (cfplus_support => version => 1, sub { 1153 $self->send_ext_req (cfplus_support => version => 2, sub {
1154 my (%msg) = @_;
1155
1167 $self->{cfplus_ext} = $_[0]{version}; 1156 $self->{cfplus_ext} = $msg{version};
1168 $self->update_server_info; 1157 $self->update_server_info;
1169 1158
1170 if ($self->{cfplus_ext} >= 2) { 1159 if ($self->{cfplus_ext} >= 2) {
1171 $self->send_ext_req ("editor_support", sub { 1160 $self->send_ext_req ("editor_support", sub {
1172 $self->{editor_support} = $_[0]; 1161 $self->{editor_support} = { @_ };
1173 $self->update_server_info; 1162 $self->update_server_info;
1174 1163
1175 0 1164 0
1176 }); 1165 });
1177 } 1166 }
… …
1185 $self->send_command ("output-count $::CFG->{output_count}"); 1174 $self->send_command ("output-count $::CFG->{output_count}");
1186 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1175 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1187 $self->send_command ("pickup $::CFG->{pickup}"); 1176 $self->send_command ("pickup $::CFG->{pickup}");
1188} 1177}
1189 1178
1190sub buildat {
1191 my ($self, $builditem, $x, $y) = @_;
1192
1193 if ($self->{cfplus_ext}) {
1194 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1195 }
1196}
1197
1198sub lookat { 1179sub lookat {
1199 my ($self, $x, $y) = @_; 1180 my ($self, $x, $y) = @_;
1200 1181
1201 if ($self->{cfplus_ext}) { 1182 if ($self->{cfplus_ext}) {
1202 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1183 $self->send_ext_req (lookat => $x, $y, sub {
1203 my ($msg) = @_; 1184 my (%msg) = @_;
1204 1185
1205 if (exists $msg->{npc_dialog}) { 1186 if (exists $msg{npc_dialog}) {
1206 # start npc chat dialog 1187 # start npc chat dialog
1207 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1188 $self->{npc_dialog} = new CFPlus::NPCDialog::
1208 dx => $x, 1189 token => $msg{npc_dialog},
1209 dy => $y,
1210 title => "$msg->{npc_dialog} (NPC)", 1190 title => "$msg{npc_dialog}[0] (NPC)",
1211 conn => $self, 1191 conn => $self,
1212 ; 1192 ;
1213 } 1193 }
1214 }); 1194 });
1215 } 1195 }
… …
1280 on_activate => sub { $this->destroy; 1 }, 1260 on_activate => sub { $this->destroy; 1 },
1281 ; 1261 ;
1282 1262
1283 $self->update_options; 1263 $self->update_options;
1284 1264
1285 $self->{id} = $self->{conn}->send_ext_req ( 1265 $self->{id} = "npc-channel-" . $self->{conn}->token;
1286 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1266 $self->{conn}->connect_ext ($self->{id} => sub {
1287 sub { $this && $this->feed (@_) } 1267 $this->feed (@_) if $this;
1288 ); 1268 });
1269
1270 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1289 1271
1290 $self->{entry}->grab_focus; 1272 $self->{entry}->grab_focus;
1291 1273
1292 $self->{textview}->add_paragraph ({ 1274 $self->{textview}->add_paragraph ({
1293 fg => [1, 1, 0, 1], 1275 fg => [1, 1, 0, 1],
… …
1316 ); 1298 );
1317 } 1299 }
1318} 1300}
1319 1301
1320sub feed { 1302sub feed {
1321 my ($self, $msg) = @_; 1303 my ($self, $type, @arg) = @_;
1322 1304
1323 CFPlus::weaken $self; 1305 CFPlus::weaken $self;
1324 1306
1325 if ($msg->{msgtype} eq "reply") { 1307 if ($type eq "update") {
1308 my (%info) = @arg;
1309
1326 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1310 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1327 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1311 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1328
1329 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1330 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1331 my @link;
1332 $text =~ s{
1333 ($match)
1334 }{
1335 my $kw = $1;
1336
1337 push @link, new CFPlus::UI::Label
1338 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1339 can_hover => 1,
1340 can_events => 1,
1341 padding_x => 0,
1342 padding_y => 0,
1343 on_button_up => sub {
1344 $self->send ($kw);
1345 };
1346
1347 "\x{fffc}"
1348 }giex;
1349 1312
1313 if (exists $info{msg}) {
1314 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1315 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1316 my @link;
1317 $text =~ s{
1318 ($match)
1319 }{
1320 my $kw = $1;
1321
1322 push @link, new CFPlus::UI::Label
1323 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1324 can_hover => 1,
1325 can_events => 1,
1326 padding_x => 0,
1327 padding_y => 0,
1328 on_button_up => sub {
1329 $self->send ($kw);
1330 };
1331
1332 "\x{fffc}"
1333 }giex;
1334
1350 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1335 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1351 $self->{textview}->scroll_to_bottom; 1336 $self->{textview}->scroll_to_bottom;
1337 }
1338
1352 $self->update_options; 1339 $self->update_options;
1353 } else { 1340 } else {
1354 $self->destroy; 1341 $self->destroy;
1355 } 1342 }
1356 1343
… …
1361 my ($self, $msg) = @_; 1348 my ($self, $msg) = @_;
1362 1349
1363 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1350 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1364 $self->{textview}->scroll_to_bottom; 1351 $self->{textview}->scroll_to_bottom;
1365 1352
1366 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1353 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1367} 1354}
1368 1355
1369sub destroy { 1356sub destroy {
1370 my ($self) = @_; 1357 my ($self) = @_;
1371 1358
1372 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1359 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1373 1360
1374 if ($self->{conn}) { 1361 if ($self->{conn}) {
1375 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1362 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1376 delete $self->{conn}{npc_dialog}; 1363 delete $self->{conn}{npc_dialog};
1377 $self->{conn}->disconnect_ext ($self->{id}); 1364 $self->{conn}->disconnect_ext ($self->{id});
1378 } 1365 }
1379 1366
1380 $self->SUPER::destroy; 1367 $self->SUPER::destroy;

Diff Legend

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