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.117 by root, Fri Jul 13 05:31:31 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) = @_;
73
74 if (defined $meta) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
76 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1];
81
82 CFPlus::DB::write_file $chksum, $data, sub { };
83 CFPlus::DB::put "res-metadata" => $chksum => $meta, sub { };
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
86 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs});
89 });
90 }
91 }
92 }
93 }
94
95 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 }
98 }); 56 });
99 57
100 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
101 my ($cap) = @_; 59 my (%cap) = @_;
102 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
103 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
104 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
105 $self->{tileset} = $default; 70 $self->{tileset} = $default;
106 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
107 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
108 73
… …
114 } 79 }
115 }); 80 });
116 81
117 $self->{json_coder} 82 $self->{json_coder}
118 ->convert_blessed 83 ->convert_blessed
119 ->filter_json_single_key_object (__widget_ref__ => sub { 84 ->filter_json_single_key_object (__w_ => sub {
120 $self->{widget}{$_[0]} 85 $self->{widget}{$_[0]}
121 }); 86 });
122 87
88 # widgetset new
123 $self->connect_ext (ws_n => sub { 89 $self->connect_ext (ws_n => sub {
124 my ($arg) = @_; 90 my ($id) = @_;
125 91
126 $self->{widgetset}{$arg{id}} = { 92 $self->{widgetset}{$id} = {
127 w => {}, 93 w => {},
128 }; 94 };
129 }); 95 });
130 96
97 # widgetset destroy
131 $self->connect_ext (ws_d => sub { 98 $self->connect_ext (ws_d => sub {
132 my ($arg) = @_; 99 my ($id) = @_;
133 100
134 my $ws = delete $self->{widgetset}{$arg{id}} 101 my $ws = delete $self->{widgetset}{$id}
135 or return; 102 or return;
136 103
137 $_->destroy 104 $_->destroy
138 for values %{$ws->{w}}; 105 for values %{$ws->{w}};
139 }); 106 });
140 107
108 # widgetset create
141 $self->connect_ext (ws_c => sub { 109 $self->connect_ext (ws_c => sub {
142 my ($arg) = @_; 110 my ($ws, $id, $class, $args) = @_;
143
144 my $args = $arg->{args} || {};
145 111
146 for my $ev (grep /^on_/, keys %$args) { 112 for my $ev (grep /^on_/, keys %$args) {
147 $args->{$ev} = sub { 113 $args->{$ev} = sub {
148 my $id = shift->{s_id}; 114 my $id = shift->{s_id};
149 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 115 $self->send_exti_msg (w_e => $id, $ev, \@_);
150 116
151 1 117 1
152 }; 118 };
153 } 119 }
154 120
155 if (my $widget = eval { 121 if (my $widget = eval {
156 local $SIG{__DIE__}; 122 local $SIG{__DIE__};
157 "CFPlus::UI::$arg->{class}"->new ( 123 "CFPlus::UI::$class"->new (
158 %$args, 124 %$args,
159 s_ws => $arg->{ws}, 125 s_ws => $ws,
160 s_id => $arg->{id}, 126 s_id => $id,
161 ) 127 )
162 } 128 }
163 ) { 129 ) {
164 $self->{widget}{$arg->{id}} 130 $self->{widget}{$id}
165 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 131 = $self->{widgetset}{$ws}{w}{$id}
166 = $widget; 132 = $widget;
167 133
168 $widget->connect (on_destroy => sub { 134 $widget->connect (on_destroy => sub {
169 my ($widget) = @_; 135 my ($widget) = @_;
170 136
171 delete $self->{widget}{$widget->{s_id}}; 137 delete $self->{widget}{$widget->{s_id}};
172 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
173 }); 139 });
174 } else { 140 } else {
175 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";
176 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 142 $self->send_exti_msg (w_e => $id, "destroy");
177 } 143 }
178 }); 144 });
179 145
146 # widget call
180 $self->connect_ext (w_c => sub { 147 $self->connect_ext (w_c => sub {
181 my ($arg) = @_; 148 my ($id, $rid, $method, $args) = @_;
182 149
183 my $w = $self->{widget}{$arg->{id}} 150 my $w = $self->{widget}{$id}
184 or return; 151 or return;
185 my $m = $arg->{name};
186 152
187 my $a = $arg->{args} || []; 153 $args ||= [];
188 154
189 if (exists $arg->{rid}) { 155 if ($rid) {
190 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
191 } else { 157 } else {
192 $w->$m (@$a); 158 $w->$method (@$args);
193 } 159 }
194 }); 160 });
195 161
162 # widget set
196 $self->connect_ext (w_s => sub { 163 $self->connect_ext (w_s => sub {
197 my ($arg) = @_; 164 my ($id, $attr) = @_;
198 165
199 my $w = $self->{widget}{$arg->{id}} 166 my $w = $self->{widget}{$id}
200 or return; 167 or return;
201 168
202 $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 }
203 }); 178 });
204 179
180 # widget get
205 $self->connect_ext (w_g => sub { 181 $self->connect_ext (w_g => sub {
206 my ($arg) = @_; 182 my ($id, $rid, $attr) = @_;
207 183
208 my $w = $self->{widget}{$arg->{id}} 184 my $w = $self->{widget}{$id}
209 or return; 185 or return;
210 186
211 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
212 }); 188 });
213 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
214 $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 {
215 for my $ws (values %{delete $self->{widgetset} || {}}) { 199 for my $ws (values %{delete $self->{widgetset} || {}}) {
216 $_->destroy 200 $_->destroy
217 for values %{delete $ws->{w} || {}}; 201 for values %{delete $ws->{w} || {}};
218 } 202 }
… …
242} 226}
243 227
244sub logprint { 228sub logprint {
245 my ($self, @a) = @_; 229 my ($self, @a) = @_;
246 230
247 $self->{log_fh} ||= do { 231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
248 my $path = "$Crossfire::VARDIR/log.$self->{host}";
249
250 open my $fh, ">>:utf8", $path
251 or die "Couldn't open logfile $path: $!";
252
253 $fh->autoflush (1);
254
255 $fh;
256 };
257
258 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
259
260 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
261 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
262
263 print {$self->{log_fh}} "$ts ", @a, "\n";
264} 232}
265 233
266sub _stat_numdiff { 234sub _stat_numdiff {
267 my ($self, $name, $old, $new) = @_; 235 my ($self, $name, $old, $new) = @_;
268 236
… …
431 my @skills = keys %{ $self->{skill_info} }; 399 my @skills = keys %{ $self->{skill_info} };
432 400
433 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 401 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
434 $sktbl->clear; 402 $sktbl->clear;
435 403
404 my @add;
405
406 push @add,
436 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
437 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 408 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
438 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
439 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
440 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 411 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
441 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
413 ;
442 414
443 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>";
444 416
445 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);
446 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);
… …
474 } 446 }
475 447
476 1 448 1
477 }; 449 };
478 450
451 push @add,
479 $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
480 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),
481 $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
482 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),
483 $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,
484 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 ;
485 459
486 $x++ and ($x, $y) = (0, $y + 1); 460 $x++ and ($x, $y) = (0, $y + 1);
487 } 461 }
462
463 $sktbl->add_at (@add);
488 } 464 }
489 465
490 for (grep exists $stats->{$_}, @skills) { 466 for (grep exists $stats->{$_}, @skills) {
491 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
492 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
729} 705}
730 706
731sub face_find { 707sub face_find {
732 my ($self, $facenum, $face, $cb) = @_; 708 my ($self, $facenum, $face, $cb) = @_;
733 709
734 my $hash = "$face->{chksum},$face->{name}"; 710 if ($face->{type} == 0) { # FT_FACE
735
736 my $id = CFPlus::DB::get_tile_id_sync $hash; 711 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
737 712
738 $face->{id} = $id; 713 $face->{id} = $id;
739 $self->{faceid}[$facenum] = $id; 714 $self->{faceid}[$facenum] = $id;
740 715
741 $self->{map}->set_tileid ($facenum => $id); 716 $self->{map}->set_tileid ($facenum => $id);
742 717
743 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 }
744} 724}
745 725
746sub face_update { 726sub face_update {
747 my ($self, $facenum, $face, $changed) = @_; 727 my ($self, $facenum, $face, $changed) = @_;
748 728
729 if ($face->{type} == 0) { # FT_FACE
749 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
750 if $changed; 731 if $changed;
751 732
752 $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 }
753} 774}
754 775
755sub smooth_update { 776sub smooth_update {
756 my ($self, $facenum, $face) = @_; 777 my ($self, $facenum, $face) = @_;
757 778
758 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
759} 780}
760 781
761sub set_texture { 782sub set_texture {
762 my ($self, $id, $data) = @_; 783 my ($self, $id, $data) = @_;
784
785 return unless $self->{map};
763 786
764 $self->{texture}[$id] = my $tex = 787 $self->{texture}[$id] = my $tex =
765 new_from_image CFPlus::Texture 788 new_from_image CFPlus::Texture
766 $data, minify => 1, mipmap => 1; 789 $data, minify => 1, mipmap => 1;
767 790
768 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 791 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
769 $self->{map_widget}->update; 792 $self->{map_widget}->update;
793
794 $_->() for @{(delete $self->{face_cb}{$id}) || []};
795}
796
797sub connect_face_update {
798 my ($self, $id, $cb) = @_;
799
800 push @{$self->{face_cb}{$id}}, $cb;
801
802 CFPlus::guard {
803 @{$self->{face_cb}{$id}}
804 = grep $_ != $cb,
805 @{$self->{face_cb}{$id}};
806 }
770} 807}
771 808
772sub sound_play { 809sub sound_play {
773 my ($self, $x, $y, $soundnum, $type) = @_; 810 my ($self, $type, $face, $dx, $dy, $vol) = @_;
774 811
775 $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
776} 814}
777 815
778my $LAST_QUERY; # server is stupid, stupid, stupid 816my $LAST_QUERY; # server is stupid, stupid, stupid
779 817
780sub query { 818sub query {
… …
845 $self->{$type} = $text; 883 $self->{$type} = $text;
846 } else { 884 } else {
847 $self->logprint ("msg: ", $text); 885 $self->logprint ("msg: ", $text);
848 return if $color < 0; # negative color == ignore if not understood 886 return if $color < 0; # negative color == ignore if not understood
849 887
850 my $fg = $CF_COLOR[$color % @CF_COLOR]; 888 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
851 889
852 ## 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
853 # no longer neecssary with TRT servers 891 # no longer neecssary with TRT servers
854 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 892 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
855 893
856 ::message ({ fg => $fg, markup => $_ }) 894 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
857 for split /\n/, $text; 895 for split /\n/, $text;
858 896
859 $self->{statusbox}->add ($text, 897 $self->{statusbox}->add ($text,
860 group => $text, 898 group => $text,
861 fg => $fg, 899 fg => $fg,
… …
918 $self->{map_widget}->clr_commands; 956 $self->{map_widget}->clr_commands;
919 957
920 ::stop_game (); 958 ::stop_game ();
921} 959}
922 960
923sub image_info {
924 my ($self, $numfaces) = @_;
925
926 $self->{num_faces} = $numfaces;
927 $self->{face_prefetch} = [1 .. $numfaces];
928 $self->face_prefetch;
929}
930
931sub face_prefetch {
932 my ($self) = @_;
933
934 return unless $::CFG->{face_prefetch};
935
936 if ($self->{num_faces}) {
937 return if @{ $self->{send_queue} || [] };
938 my $todo = @{ $self->{face_prefetch} }
939 or return;
940
941 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
942
943 $self->send ("requestinfo image_sums $face $face");
944
945 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
946 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
947 } elsif (!exists $self->{num_faces}) {
948 $self->send ("requestinfo image_info");
949
950 $self->{num_faces} = 0;
951
952 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
953 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
954 }
955}
956
957sub update_floorbox { 961sub update_floorbox {
958 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 962 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
959 return unless $::CONN; 963 return unless $::CONN;
960 964
961 $::FLOORBOX->clear; 965 $::FLOORBOX->clear;
966
967 my @add;
962 968
963 my $row; 969 my $row;
964 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} }) {
965 if ($row < 6) { 971 if ($row < 6) {
966 local $_->{face_widget}; # hack to force recreation of widget 972 local $_->{face_widget}; # hack to force recreation of widget
967 local $_->{desc_widget}; # hack to force recreation of widget 973 local $_->{desc_widget}; # hack to force recreation of widget
968 CFPlus::Item::update_widgets $_; 974 CFPlus::Item::update_widgets $_;
969 975
976 push @add,
970 $::FLOORBOX->add (0, $row, $_->{face_widget}); 977 0, $row, $_->{face_widget},
971 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 978 1, $row, $_->{desc_widget};
972 979
973 $row++; 980 $row++;
974 } else { 981 } else {
975 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 982 push @add, 1, $row, new CFPlus::UI::Button
976 text => "More...", 983 text => "More...",
977 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 984 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
978 ); 985 ;
979 last; 986 last;
980 } 987 }
981 } 988 }
982 if ($::CONN->{open_container}) { 989 if ($::CONN->{open_container}) {
983 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 990 push @add, 1, $row++, new CFPlus::UI::Button
984 text => "Close container", 991 text => "Close container",
985 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 992 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
986 ); 993 ;
987 } 994 }
995
996 $::FLOORBOX->add_at (@add);
988 }); 997 });
989 998
990 $::WANT_REFRESH++; 999 $::WANT_REFRESH++;
991} 1000}
992 1001
… …
1112 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1121 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1113 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1122 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1114 . "map size $self->{mapw}×$self->{maph}\n" 1123 . "map size $self->{mapw}×$self->{maph}\n"
1115 ); 1124 );
1116 1125
1117 ::setup_build_button ($self->{editor_support}->{builder_ui});
1118} 1126}
1119 1127
1120sub logged_in { 1128sub logged_in {
1121 my ($self) = @_; 1129 my ($self) = @_;
1122 1130
1123 $self->send_ext_req (cfplus_support => version => 1, sub { 1131 $self->send_ext_req (cfplus_support => version => 2, sub {
1132 my (%msg) = @_;
1133
1124 $self->{cfplus_ext} = $_[0]{version}; 1134 $self->{cfplus_ext} = $msg{version};
1125 $self->update_server_info; 1135 $self->update_server_info;
1126 1136
1127 if ($self->{cfplus_ext} >= 2) { 1137 if ($self->{cfplus_ext} >= 2) {
1128 $self->send_ext_req ("editor_support", sub { 1138 $self->send_ext_req ("editor_support", sub {
1129 $self->{editor_support} = $_[0]; 1139 $self->{editor_support} = { @_ };
1130 $self->update_server_info; 1140 $self->update_server_info;
1131 1141
1132 0 1142 0
1133 }); 1143 });
1134 } 1144 }
… …
1142 $self->send_command ("output-count $::CFG->{output_count}"); 1152 $self->send_command ("output-count $::CFG->{output_count}");
1143 $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;
1144 $self->send_command ("pickup $::CFG->{pickup}"); 1154 $self->send_command ("pickup $::CFG->{pickup}");
1145} 1155}
1146 1156
1147sub buildat {
1148 my ($self, $builditem, $x, $y) = @_;
1149
1150 if ($self->{cfplus_ext}) {
1151 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1152 }
1153}
1154
1155sub lookat { 1157sub lookat {
1156 my ($self, $x, $y) = @_; 1158 my ($self, $x, $y) = @_;
1157 1159
1158 if ($self->{cfplus_ext}) { 1160 if ($self->{cfplus_ext}) {
1159 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1161 $self->send_ext_req (lookat => $x, $y, sub {
1160 my ($msg) = @_; 1162 my (%msg) = @_;
1161 1163
1162 if (exists $msg->{npc_dialog}) { 1164 if (exists $msg{npc_dialog}) {
1163 # start npc chat dialog 1165 # start npc chat dialog
1164 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1166 $self->{npc_dialog} = new CFPlus::NPCDialog::
1165 dx => $x, 1167 token => $msg{npc_dialog},
1166 dy => $y,
1167 title => "$msg->{npc_dialog} (NPC)", 1168 title => "$msg{npc_dialog}[0] (NPC)",
1168 conn => $self, 1169 conn => $self,
1169 ; 1170 ;
1170 } 1171 }
1171 }); 1172 });
1172 } 1173 }
… …
1237 on_activate => sub { $this->destroy; 1 }, 1238 on_activate => sub { $this->destroy; 1 },
1238 ; 1239 ;
1239 1240
1240 $self->update_options; 1241 $self->update_options;
1241 1242
1242 $self->{id} = $self->{conn}->send_ext_req ( 1243 $self->{id} = "npc-channel-" . $self->{conn}->token;
1243 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1244 $self->{conn}->connect_ext ($self->{id} => sub {
1244 sub { $this && $this->feed (@_) } 1245 $this->feed (@_) if $this;
1245 ); 1246 });
1247
1248 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1246 1249
1247 $self->{entry}->grab_focus; 1250 $self->{entry}->grab_focus;
1248 1251
1249 $self->{textview}->add_paragraph ({ 1252 $self->{textview}->add_paragraph ({
1250 fg => [1, 1, 0, 1], 1253 fg => [1, 1, 0, 1],
… …
1273 ); 1276 );
1274 } 1277 }
1275} 1278}
1276 1279
1277sub feed { 1280sub feed {
1278 my ($self, $msg) = @_; 1281 my ($self, $type, @arg) = @_;
1279 1282
1280 CFPlus::weaken $self; 1283 CFPlus::weaken $self;
1281 1284
1282 if ($msg->{msgtype} eq "reply") { 1285 if ($type eq "update") {
1286 my (%info) = @arg;
1287
1283 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1288 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1284 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1289 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1285
1286 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1287 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1288 my @link;
1289 $text =~ s{
1290 ($match)
1291 }{
1292 my $kw = $1;
1293
1294 push @link, new CFPlus::UI::Label
1295 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1296 can_hover => 1,
1297 can_events => 1,
1298 padding_x => 0,
1299 padding_y => 0,
1300 on_button_up => sub {
1301 $self->send ($kw);
1302 };
1303
1304 "\x{fffc}"
1305 }giex;
1306 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
1307 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1313 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1308 $self->{textview}->scroll_to_bottom; 1314 $self->{textview}->scroll_to_bottom;
1315 }
1316
1309 $self->update_options; 1317 $self->update_options;
1310 } else { 1318 } else {
1311 $self->destroy; 1319 $self->destroy;
1312 } 1320 }
1313 1321
… …
1318 my ($self, $msg) = @_; 1326 my ($self, $msg) = @_;
1319 1327
1320 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1328 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1321 $self->{textview}->scroll_to_bottom; 1329 $self->{textview}->scroll_to_bottom;
1322 1330
1323 $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);
1324} 1332}
1325 1333
1326sub destroy { 1334sub destroy {
1327 my ($self) = @_; 1335 my ($self) = @_;
1328 1336
1329 #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
1330 1338
1331 if ($self->{conn}) { 1339 if ($self->{conn}) {
1332 $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};
1333 delete $self->{conn}{npc_dialog}; 1341 delete $self->{conn}{npc_dialog};
1334 $self->{conn}->disconnect_ext ($self->{id}); 1342 $self->{conn}->disconnect_ext ($self->{id});
1335 } 1343 }
1336 1344
1337 $self->SUPER::destroy; 1345 $self->SUPER::destroy;

Diff Legend

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