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.122 by root, Sun Jul 15 22:07:48 2007 UTC vs.
Revision 1.145 by root, Mon Aug 6 02:11:45 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 xwidget => 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
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
110 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default; 70 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
115 73
… …
121 } 79 }
122 }); 80 });
123 81
124 $self->{json_coder} 82 $self->{json_coder}
125 ->convert_blessed 83 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 84 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]} 85 $self->{widget}{$_[0]}
128 }); 86 });
129 87
88 # widgetset new
130 $self->connect_ext (ws_n => sub { 89 $self->connect_ext (ws_n => sub {
131 my ($arg) = @_; 90 my ($id) = @_;
132 91
133 $self->{widgetset}{$arg{id}} = { 92 $self->{widgetset}{$id} = {
134 w => {}, 93 w => {},
135 }; 94 };
136 }); 95 });
137 96
97 # widgetset destroy
138 $self->connect_ext (ws_d => sub { 98 $self->connect_ext (ws_d => sub {
139 my ($arg) = @_; 99 my ($id) = @_;
140 100
141 my $ws = delete $self->{widgetset}{$arg{id}} 101 my $ws = delete $self->{widgetset}{$id}
142 or return; 102 or return;
143 103
144 $_->destroy 104 $_->destroy
145 for values %{$ws->{w}}; 105 for values %{$ws->{w}};
146 }); 106 });
147 107
108 # widgetset create
148 $self->connect_ext (ws_c => sub { 109 $self->connect_ext (ws_c => sub {
149 my ($arg) = @_; 110 my ($ws, $id, $class, $args) = @_;
150
151 my $args = $arg->{args} || {};
152 111
153 for my $ev (grep /^on_/, keys %$args) { 112 for my $ev (grep /^on_/, keys %$args) {
154 $args->{$ev} = sub { 113 $args->{$ev} = sub {
155 my $id = shift->{s_id}; 114 my $id = shift->{s_id};
156 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 115 $self->send_exti_msg (w_e => $id, $ev, \@_);
157 116
158 1 117 1
159 }; 118 };
160 } 119 }
161 120
162 if (my $widget = eval { 121 if (my $widget = eval {
163 local $SIG{__DIE__}; 122 local $SIG{__DIE__};
164 "CFPlus::UI::$arg->{class}"->new ( 123 "CFPlus::UI::$class"->new (
165 %$args, 124 %$args,
166 s_ws => $arg->{ws}, 125 s_ws => $ws,
167 s_id => $arg->{id}, 126 s_id => $id,
168 ) 127 )
169 } 128 }
170 ) { 129 ) {
171 $self->{widget}{$arg->{id}} 130 $self->{widget}{$id}
172 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 131 = $self->{widgetset}{$ws}{w}{$id}
173 = $widget; 132 = $widget;
174 133
175 $widget->connect (on_destroy => sub { 134 $widget->connect (on_destroy => sub {
176 my ($widget) = @_; 135 my ($widget) = @_;
177 136
178 delete $self->{widget}{$widget->{s_id}}; 137 delete $self->{widget}{$widget->{s_id}};
179 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
180 }); 139 });
181 } else { 140 } else {
182 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
183 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 142 $self->send_exti_msg (w_e => $id, "destroy");
184 } 143 }
185 }); 144 });
186 145
146 # widget call
187 $self->connect_ext (w_c => sub { 147 $self->connect_ext (w_c => sub {
188 my ($arg) = @_; 148 my ($id, $rid, $method, $args) = @_;
189 149
190 my $w = $self->{widget}{$arg->{id}} 150 my $w = $self->{widget}{$id}
191 or return; 151 or return;
192 my $m = $arg->{name};
193 152
194 my $a = $arg->{args} || []; 153 $args ||= [];
195 154
196 if (exists $arg->{rid}) { 155 if ($rid) {
197 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
198 } else { 157 } else {
199 $w->$m (@$a); 158 $w->$method (@$args);
200 } 159 }
201 }); 160 });
202 161
162 # widget set
203 $self->connect_ext (w_s => sub { 163 $self->connect_ext (w_s => sub {
204 my ($arg) = @_; 164 my ($id, $attr) = @_;
205 165
206 my $w = $self->{widget}{$arg->{id}} 166 my $w = $self->{widget}{$id}
207 or return; 167 or return;
208 168
209 $w->{$arg->{name}} = $arg->{value}; 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 }
210 }); 178 });
211 179
180 # widget get
212 $self->connect_ext (w_g => sub { 181 $self->connect_ext (w_g => sub {
213 my ($arg) = @_; 182 my ($id, $rid, $attr) = @_;
214 183
215 my $w = $self->{widget}{$arg->{id}} 184 my $w = $self->{widget}{$id}
216 or return; 185 or return;
217 186
218 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
219 }); 188 });
220 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
221 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
222 for my $ws (values %{delete $self->{widgetset} || {}}) { 199 for my $ws (values %{delete $self->{widgetset} || {}}) {
223 $_->destroy 200 $_->destroy
224 for values %{delete $ws->{w} || {}}; 201 for values %{delete $ws->{w} || {}};
225 } 202 }
… …
249} 226}
250 227
251sub logprint { 228sub logprint {
252 my ($self, @a) = @_; 229 my ($self, @a) = @_;
253 230
254 $self->{log_fh} ||= do { 231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
255 my $path = "$Crossfire::VARDIR/log.$self->{host}";
256
257 open my $fh, ">>:utf8", $path
258 or die "Couldn't open logfile $path: $!";
259
260 $fh->autoflush (1);
261
262 $fh;
263 };
264
265 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
266
267 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
268 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
269
270 print {$self->{log_fh}} "$ts ", @a, "\n";
271} 232}
272 233
273sub _stat_numdiff { 234sub _stat_numdiff {
274 my ($self, $name, $old, $new) = @_; 235 my ($self, $name, $old, $new) = @_;
275 236
… …
438 my @skills = keys %{ $self->{skill_info} }; 399 my @skills = keys %{ $self->{skill_info} };
439 400
440 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 401 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
441 $sktbl->clear; 402 $sktbl->clear;
442 403
404 my @add;
405
406 push @add,
443 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
444 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 408 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
445 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
446 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
447 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 411 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
448 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
413 ;
449 414
450 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 415 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
451 416
452 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 417 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
453 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 418 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
481 } 446 }
482 447
483 1 448 1
484 }; 449 };
485 450
451 push @add,
486 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 452 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
487 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 453 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
488 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 454 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
489 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 455 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
490 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 456 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
491 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 457 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
458 ;
492 459
493 $x++ and ($x, $y) = (0, $y + 1); 460 $x++ and ($x, $y) = (0, $y + 1);
494 } 461 }
462
463 $sktbl->add_at (@add);
495 } 464 }
496 465
497 for (grep exists $stats->{$_}, @skills) { 466 for (grep exists $stats->{$_}, @skills) {
498 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
499 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
736} 705}
737 706
738sub face_find { 707sub face_find {
739 my ($self, $facenum, $face, $cb) = @_; 708 my ($self, $facenum, $face, $cb) = @_;
740 709
741 my $hash = "$face->{chksum},$face->{name}"; 710 if ($face->{type} == 0) { # FT_FACE
742
743 my $id = CFPlus::DB::get_tile_id_sync $hash; 711 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
744 712
745 $face->{id} = $id; 713 $face->{id} = $id;
746 $self->{faceid}[$facenum] = $id; 714 $self->{faceid}[$facenum] = $id;
747 715
748 $self->{map}->set_tileid ($facenum => $id); 716 $self->{map}->set_tileid ($facenum => $id);
749 717
750 CFPlus::DB::get tilecache => $id, $cb; 718 CFPlus::DB::get tilecache => $id, $cb;
719
720 } elsif ($face->{type} & 1) { # with metadata
721 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
722 CFPlus::DB::get res_meta => $face->{name}, $cb;
723 }
751} 724}
752 725
753sub face_update { 726sub face_update {
754 my ($self, $facenum, $face, $changed) = @_; 727 my ($self, $facenum, $face, $changed) = @_;
755 728
729 if ($face->{type} == 0) { # FT_FACE
756 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
757 if $changed; 731 if $changed;
758 732
759 $self->set_texture ($face->{id} => delete $face->{image}); 733 $self->set_texture ($face->{id} => delete $face->{data});
734
735 } elsif ($face->{type} & 1) { # split metadata
736 my $cb = sub { };
737
738 if ($face->{type} == 3) { # FT_MUSIC
739 $cb = sub {
740 $self->{music_meta}{$facenum} = $face;
741
742 ::message ({ markup => "downloaded song #$facenum" })
743 if $changed;
744
745 &::audio_music_push ($facenum);
746 };
747 } elsif ($face->{type} == 5) { # FT_SOUND
748 $cb = sub {
749 $self->{sound_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded sound #$facenum" })
752 if $changed;
753
754 &::audio_sound_push ($facenum);
755 };
756 }
757
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760
761 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
763 $face->{meta} = $self->{json_coder}->decode ($meta_json);
764 ::add_license ($face);
765 $cb->();
766 };
767
768 } else {
769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
770 ::add_license ($face);
771 $cb->();
772 }
773 }
760} 774}
761 775
762sub smooth_update { 776sub smooth_update {
763 my ($self, $facenum, $face) = @_; 777 my ($self, $facenum, $face) = @_;
764 778
… …
791 @{$self->{face_cb}{$id}}; 805 @{$self->{face_cb}{$id}};
792 } 806 }
793} 807}
794 808
795sub sound_play { 809sub sound_play {
796 my ($self, $x, $y, $soundnum, $type) = @_; 810 my ($self, $type, $face, $dx, $dy, $vol) = @_;
797 811
798 $self->{sound_play}->($x, $y, $soundnum, $type); 812 &::audio_sound_play ($face, $dx, $dy, $vol)
813 unless $type & 1; # odd types are silent for future expansion
799} 814}
800 815
801my $LAST_QUERY; # server is stupid, stupid, stupid 816my $LAST_QUERY; # server is stupid, stupid, stupid
802 817
803sub query { 818sub query {
… …
868 $self->{$type} = $text; 883 $self->{$type} = $text;
869 } else { 884 } else {
870 $self->logprint ("msg: ", $text); 885 $self->logprint ("msg: ", $text);
871 return if $color < 0; # negative color == ignore if not understood 886 return if $color < 0; # negative color == ignore if not understood
872 887
873 my $fg = $CF_COLOR[$color % @CF_COLOR]; 888 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
874 889
875 ## try to create single paragraphs of multiple lines sent by the server 890 ## try to create single paragraphs of multiple lines sent by the server
876 # no longer neecssary with TRT servers 891 # no longer neecssary with TRT servers
877 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 892 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
878 893
879 ::message ({ fg => $fg, markup => $_ }) 894 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
880 for split /\n/, $text; 895 for split /\n/, $text;
881 896
882 $self->{statusbox}->add ($text, 897 $self->{statusbox}->add ($text,
883 group => $text, 898 group => $text,
884 fg => $fg, 899 fg => $fg,
… …
941 $self->{map_widget}->clr_commands; 956 $self->{map_widget}->clr_commands;
942 957
943 ::stop_game (); 958 ::stop_game ();
944} 959}
945 960
946sub image_info {
947 my ($self, $numfaces) = @_;
948
949 $self->{num_faces} = $numfaces;
950 $self->{face_prefetch} = [1 .. $numfaces];
951 $self->face_prefetch;
952}
953
954sub face_prefetch {
955 my ($self) = @_;
956
957 return unless $::CFG->{face_prefetch};
958
959 if ($self->{num_faces}) {
960 return if @{ $self->{send_queue} || [] };
961 my $todo = @{ $self->{face_prefetch} }
962 or return;
963
964 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
965
966 $self->send ("requestinfo image_sums $face $face");
967
968 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
969 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
970 } elsif (!exists $self->{num_faces}) {
971 $self->send ("requestinfo image_info");
972
973 $self->{num_faces} = 0;
974
975 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
976 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
977 }
978}
979
980sub update_floorbox { 961sub update_floorbox {
981 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 962 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
982 return unless $::CONN; 963 return unless $::CONN;
983 964
984 $::FLOORBOX->clear; 965 $::FLOORBOX->clear;
966
967 my @add;
985 968
986 my $row; 969 my $row;
987 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 970 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
988 if ($row < 6) { 971 if ($row < 6) {
989 local $_->{face_widget}; # hack to force recreation of widget 972 local $_->{face_widget}; # hack to force recreation of widget
990 local $_->{desc_widget}; # hack to force recreation of widget 973 local $_->{desc_widget}; # hack to force recreation of widget
991 CFPlus::Item::update_widgets $_; 974 CFPlus::Item::update_widgets $_;
992 975
976 push @add,
993 $::FLOORBOX->add (0, $row, $_->{face_widget}); 977 0, $row, $_->{face_widget},
994 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 978 1, $row, $_->{desc_widget};
995 979
996 $row++; 980 $row++;
997 } else { 981 } else {
998 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 982 push @add, 1, $row, new CFPlus::UI::Button
999 text => "More...", 983 text => "More...",
1000 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 984 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1001 ); 985 ;
1002 last; 986 last;
1003 } 987 }
1004 } 988 }
1005 if ($::CONN->{open_container}) { 989 if ($::CONN->{open_container}) {
1006 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 990 push @add, 1, $row++, new CFPlus::UI::Button
1007 text => "Close container", 991 text => "Close container",
1008 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 992 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1009 ); 993 ;
1010 } 994 }
995
996 $::FLOORBOX->add_at (@add);
1011 }); 997 });
1012 998
1013 $::WANT_REFRESH++; 999 $::WANT_REFRESH++;
1014} 1000}
1015 1001
… …
1135 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1121 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1136 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1122 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1137 . "map size $self->{mapw}×$self->{maph}\n" 1123 . "map size $self->{mapw}×$self->{maph}\n"
1138 ); 1124 );
1139 1125
1140 ::setup_build_button ($self->{editor_support}->{builder_ui});
1141} 1126}
1142 1127
1143sub logged_in { 1128sub logged_in {
1144 my ($self) = @_; 1129 my ($self) = @_;
1145 1130
1146 $self->send_ext_req (cfplus_support => version => 1, sub { 1131 $self->send_ext_req (cfplus_support => version => 2, sub {
1132 my (%msg) = @_;
1133
1147 $self->{cfplus_ext} = $_[0]{version}; 1134 $self->{cfplus_ext} = $msg{version};
1148 $self->update_server_info; 1135 $self->update_server_info;
1149 1136
1150 if ($self->{cfplus_ext} >= 2) { 1137 if ($self->{cfplus_ext} >= 2) {
1151 $self->send_ext_req ("editor_support", sub { 1138 $self->send_ext_req ("editor_support", sub {
1152 $self->{editor_support} = $_[0]; 1139 $self->{editor_support} = { @_ };
1153 $self->update_server_info; 1140 $self->update_server_info;
1154 1141
1155 0 1142 0
1156 }); 1143 });
1157 } 1144 }
… …
1165 $self->send_command ("output-count $::CFG->{output_count}"); 1152 $self->send_command ("output-count $::CFG->{output_count}");
1166 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1153 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1167 $self->send_command ("pickup $::CFG->{pickup}"); 1154 $self->send_command ("pickup $::CFG->{pickup}");
1168} 1155}
1169 1156
1170sub buildat {
1171 my ($self, $builditem, $x, $y) = @_;
1172
1173 if ($self->{cfplus_ext}) {
1174 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1175 }
1176}
1177
1178sub lookat { 1157sub lookat {
1179 my ($self, $x, $y) = @_; 1158 my ($self, $x, $y) = @_;
1180 1159
1181 if ($self->{cfplus_ext}) { 1160 if ($self->{cfplus_ext}) {
1182 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1161 $self->send_ext_req (lookat => $x, $y, sub {
1183 my ($msg) = @_; 1162 my (%msg) = @_;
1184 1163
1185 if (exists $msg->{npc_dialog}) { 1164 if (exists $msg{npc_dialog}) {
1186 # start npc chat dialog 1165 # start npc chat dialog
1187 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1166 $self->{npc_dialog} = new CFPlus::NPCDialog::
1188 dx => $x, 1167 token => $msg{npc_dialog},
1189 dy => $y,
1190 title => "$msg->{npc_dialog} (NPC)", 1168 title => "$msg{npc_dialog}[0] (NPC)",
1191 conn => $self, 1169 conn => $self,
1192 ; 1170 ;
1193 } 1171 }
1194 }); 1172 });
1195 } 1173 }
… …
1260 on_activate => sub { $this->destroy; 1 }, 1238 on_activate => sub { $this->destroy; 1 },
1261 ; 1239 ;
1262 1240
1263 $self->update_options; 1241 $self->update_options;
1264 1242
1265 $self->{id} = $self->{conn}->send_ext_req ( 1243 $self->{id} = "npc-channel-" . $self->{conn}->token;
1266 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1244 $self->{conn}->connect_ext ($self->{id} => sub {
1267 sub { $this && $this->feed (@_) } 1245 $this->feed (@_) if $this;
1268 ); 1246 });
1247
1248 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1269 1249
1270 $self->{entry}->grab_focus; 1250 $self->{entry}->grab_focus;
1271 1251
1272 $self->{textview}->add_paragraph ({ 1252 $self->{textview}->add_paragraph ({
1273 fg => [1, 1, 0, 1], 1253 fg => [1, 1, 0, 1],
… …
1296 ); 1276 );
1297 } 1277 }
1298} 1278}
1299 1279
1300sub feed { 1280sub feed {
1301 my ($self, $msg) = @_; 1281 my ($self, $type, @arg) = @_;
1302 1282
1303 CFPlus::weaken $self; 1283 CFPlus::weaken $self;
1304 1284
1305 if ($msg->{msgtype} eq "reply") { 1285 if ($type eq "update") {
1286 my (%info) = @arg;
1287
1306 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1288 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1307 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1289 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1308
1309 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1310 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1311 my @link;
1312 $text =~ s{
1313 ($match)
1314 }{
1315 my $kw = $1;
1316
1317 push @link, new CFPlus::UI::Label
1318 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1319 can_hover => 1,
1320 can_events => 1,
1321 padding_x => 0,
1322 padding_y => 0,
1323 on_button_up => sub {
1324 $self->send ($kw);
1325 };
1326
1327 "\x{fffc}"
1328 }giex;
1329 1290
1291 if (exists $info{msg}) {
1292 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1293 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1294 my @link;
1295 $text =~ s{
1296 ($match)
1297 }{
1298 my $kw = $1;
1299
1300 push @link, new CFPlus::UI::Label
1301 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1302 can_hover => 1,
1303 can_events => 1,
1304 padding_x => 0,
1305 padding_y => 0,
1306 on_button_up => sub {
1307 $self->send ($kw);
1308 };
1309
1310 "\x{fffc}"
1311 }giex;
1312
1330 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1313 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1331 $self->{textview}->scroll_to_bottom; 1314 $self->{textview}->scroll_to_bottom;
1315 }
1316
1332 $self->update_options; 1317 $self->update_options;
1333 } else { 1318 } else {
1334 $self->destroy; 1319 $self->destroy;
1335 } 1320 }
1336 1321
… …
1341 my ($self, $msg) = @_; 1326 my ($self, $msg) = @_;
1342 1327
1343 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1328 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1344 $self->{textview}->scroll_to_bottom; 1329 $self->{textview}->scroll_to_bottom;
1345 1330
1346 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1331 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1347} 1332}
1348 1333
1349sub destroy { 1334sub destroy {
1350 my ($self) = @_; 1335 my ($self) = @_;
1351 1336
1352 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1337 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1353 1338
1354 if ($self->{conn}) { 1339 if ($self->{conn}) {
1355 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1340 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1356 delete $self->{conn}{npc_dialog}; 1341 delete $self->{conn}{npc_dialog};
1357 $self->{conn}->disconnect_ext ($self->{id}); 1342 $self->{conn}->disconnect_ext ($self->{id});
1358 } 1343 }
1359 1344
1360 $self->SUPER::destroy; 1345 $self->SUPER::destroy;

Diff Legend

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