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.115 by root, Thu Jul 12 19:10:52 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, 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 resmap => $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 resmap => $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 use Data::Dumper;
98 warn Dumper $self->{songs};#d#
99 }
100 }); 56 });
101 57
102 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
103 my ($cap) = @_; 59 my (%cap) = @_;
104 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
105 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
106 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
107 $self->{tileset} = $default; 70 $self->{tileset} = $default;
108 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
109 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
110 73
… …
116 } 79 }
117 }); 80 });
118 81
119 $self->{json_coder} 82 $self->{json_coder}
120 ->convert_blessed 83 ->convert_blessed
121 ->filter_json_single_key_object (__widget_ref__ => sub { 84 ->filter_json_single_key_object (__w_ => sub {
122 $self->{widget}{$_[0]} 85 $self->{widget}{$_[0]}
123 }); 86 });
124 87
88 # widgetset new
125 $self->connect_ext (ws_n => sub { 89 $self->connect_ext (ws_n => sub {
126 my ($arg) = @_; 90 my ($id) = @_;
127 91
128 $self->{widgetset}{$arg{id}} = { 92 $self->{widgetset}{$id} = {
129 w => {}, 93 w => {},
130 }; 94 };
131 }); 95 });
132 96
97 # widgetset destroy
133 $self->connect_ext (ws_d => sub { 98 $self->connect_ext (ws_d => sub {
134 my ($arg) = @_; 99 my ($id) = @_;
135 100
136 my $ws = delete $self->{widgetset}{$arg{id}} 101 my $ws = delete $self->{widgetset}{$id}
137 or return; 102 or return;
138 103
139 $_->destroy 104 $_->destroy
140 for values %{$ws->{w}}; 105 for values %{$ws->{w}};
141 }); 106 });
142 107
108 # widgetset create
143 $self->connect_ext (ws_c => sub { 109 $self->connect_ext (ws_c => sub {
144 my ($arg) = @_; 110 my ($ws, $id, $class, $args) = @_;
145
146 my $args = $arg->{args} || {};
147 111
148 for my $ev (grep /^on_/, keys %$args) { 112 for my $ev (grep /^on_/, keys %$args) {
149 $args->{$ev} = sub { 113 $args->{$ev} = sub {
150 my $id = shift->{s_id}; 114 my $id = shift->{s_id};
151 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 115 $self->send_exti_msg (w_e => $id, $ev, \@_);
152 116
153 1 117 1
154 }; 118 };
155 } 119 }
156 120
157 if (my $widget = eval { 121 if (my $widget = eval {
158 local $SIG{__DIE__}; 122 local $SIG{__DIE__};
159 "CFPlus::UI::$arg->{class}"->new ( 123 "CFPlus::UI::$class"->new (
160 %$args, 124 %$args,
161 s_ws => $arg->{ws}, 125 s_ws => $ws,
162 s_id => $arg->{id}, 126 s_id => $id,
163 ) 127 )
164 } 128 }
165 ) { 129 ) {
166 $self->{widget}{$arg->{id}} 130 $self->{widget}{$id}
167 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 131 = $self->{widgetset}{$ws}{w}{$id}
168 = $widget; 132 = $widget;
169 133
170 $widget->connect (on_destroy => sub { 134 $widget->connect (on_destroy => sub {
171 my ($widget) = @_; 135 my ($widget) = @_;
172 136
173 delete $self->{widget}{$widget->{s_id}}; 137 delete $self->{widget}{$widget->{s_id}};
174 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
175 }); 139 });
176 } else { 140 } else {
177 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";
178 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 142 $self->send_exti_msg (w_e => $id, "destroy");
179 } 143 }
180 }); 144 });
181 145
146 # widget call
182 $self->connect_ext (w_c => sub { 147 $self->connect_ext (w_c => sub {
183 my ($arg) = @_; 148 my ($id, $rid, $method, $args) = @_;
184 149
185 my $w = $self->{widget}{$arg->{id}} 150 my $w = $self->{widget}{$id}
186 or return; 151 or return;
187 my $m = $arg->{name};
188 152
189 my $a = $arg->{args} || []; 153 $args ||= [];
190 154
191 if (exists $arg->{rid}) { 155 if ($rid) {
192 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
193 } else { 157 } else {
194 $w->$m (@$a); 158 $w->$method (@$args);
195 } 159 }
196 }); 160 });
197 161
162 # widget set
198 $self->connect_ext (w_s => sub { 163 $self->connect_ext (w_s => sub {
199 my ($arg) = @_; 164 my ($id, $attr) = @_;
200 165
201 my $w = $self->{widget}{$arg->{id}} 166 my $w = $self->{widget}{$id}
202 or return; 167 or return;
203 168
204 $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 }
205 }); 178 });
206 179
180 # widget get
207 $self->connect_ext (w_g => sub { 181 $self->connect_ext (w_g => sub {
208 my ($arg) = @_; 182 my ($id, $rid, $attr) = @_;
209 183
210 my $w = $self->{widget}{$arg->{id}} 184 my $w = $self->{widget}{$id}
211 or return; 185 or return;
212 186
213 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
214 }); 188 });
215 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
216 $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 {
217 for my $ws (values %{delete $self->{widgetset} || {}}) { 199 for my $ws (values %{delete $self->{widgetset} || {}}) {
218 $_->destroy 200 $_->destroy
219 for values %{delete $ws->{w} || {}}; 201 for values %{delete $ws->{w} || {}};
220 } 202 }
… …
433 my @skills = keys %{ $self->{skill_info} }; 415 my @skills = keys %{ $self->{skill_info} };
434 416
435 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 417 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
436 $sktbl->clear; 418 $sktbl->clear;
437 419
420 my @add;
421
422 push @add,
438 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 423 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
439 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 424 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
440 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 425 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
441 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 426 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
442 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 427 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
443 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 428 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
429 ;
444 430
445 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>";
446 432
447 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);
448 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);
… …
476 } 462 }
477 463
478 1 464 1
479 }; 465 };
480 466
467 push @add,
481 $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
482 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),
483 $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
484 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),
485 $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,
486 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 ;
487 475
488 $x++ and ($x, $y) = (0, $y + 1); 476 $x++ and ($x, $y) = (0, $y + 1);
489 } 477 }
478
479 $sktbl->add_at (@add);
490 } 480 }
491 481
492 for (grep exists $stats->{$_}, @skills) { 482 for (grep exists $stats->{$_}, @skills) {
493 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 483 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
494 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 484 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
731} 721}
732 722
733sub face_find { 723sub face_find {
734 my ($self, $facenum, $face, $cb) = @_; 724 my ($self, $facenum, $face, $cb) = @_;
735 725
736 my $hash = "$face->{chksum},$face->{name}"; 726 if ($face->{type} == 0) { # FT_FACE
737
738 my $id = CFPlus::DB::get_tile_id_sync $hash; 727 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
739 728
740 $face->{id} = $id; 729 $face->{id} = $id;
741 $self->{faceid}[$facenum] = $id; 730 $self->{faceid}[$facenum] = $id;
742 731
743 $self->{map}->set_tileid ($facenum => $id); 732 $self->{map}->set_tileid ($facenum => $id);
744 733
745 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 }
746} 740}
747 741
748sub face_update { 742sub face_update {
749 my ($self, $facenum, $face, $changed) = @_; 743 my ($self, $facenum, $face, $changed) = @_;
750 744
745 if ($face->{type} == 0) { # FT_FACE
751 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
752 if $changed; 747 if $changed;
753 748
754 $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 }
755} 790}
756 791
757sub smooth_update { 792sub smooth_update {
758 my ($self, $facenum, $face) = @_; 793 my ($self, $facenum, $face) = @_;
759 794
760 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 795 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
761} 796}
762 797
763sub set_texture { 798sub set_texture {
764 my ($self, $id, $data) = @_; 799 my ($self, $id, $data) = @_;
800
801 return unless $self->{map};
765 802
766 $self->{texture}[$id] = my $tex = 803 $self->{texture}[$id] = my $tex =
767 new_from_image CFPlus::Texture 804 new_from_image CFPlus::Texture
768 $data, minify => 1, mipmap => 1; 805 $data, minify => 1, mipmap => 1;
769 806
770 $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}});
771 $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 }
772} 823}
773 824
774sub sound_play { 825sub sound_play {
775 my ($self, $x, $y, $soundnum, $type) = @_; 826 my ($self, $type, $face, $dx, $dy, $vol) = @_;
776 827
777 $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
778} 830}
779 831
780my $LAST_QUERY; # server is stupid, stupid, stupid 832my $LAST_QUERY; # server is stupid, stupid, stupid
781 833
782sub query { 834sub query {
… …
847 $self->{$type} = $text; 899 $self->{$type} = $text;
848 } else { 900 } else {
849 $self->logprint ("msg: ", $text); 901 $self->logprint ("msg: ", $text);
850 return if $color < 0; # negative color == ignore if not understood 902 return if $color < 0; # negative color == ignore if not understood
851 903
852 my $fg = $CF_COLOR[$color % @CF_COLOR]; 904 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
853 905
854 ## 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
855 # no longer neecssary with TRT servers 907 # no longer neecssary with TRT servers
856 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 908 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
857 909
858 ::message ({ fg => $fg, markup => $_ }) 910 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
859 for split /\n/, $text; 911 for split /\n/, $text;
860 912
861 $self->{statusbox}->add ($text, 913 $self->{statusbox}->add ($text,
862 group => $text, 914 group => $text,
863 fg => $fg, 915 fg => $fg,
… …
920 $self->{map_widget}->clr_commands; 972 $self->{map_widget}->clr_commands;
921 973
922 ::stop_game (); 974 ::stop_game ();
923} 975}
924 976
925sub image_info {
926 my ($self, $numfaces) = @_;
927
928 $self->{num_faces} = $numfaces;
929 $self->{face_prefetch} = [1 .. $numfaces];
930 $self->face_prefetch;
931}
932
933sub face_prefetch {
934 my ($self) = @_;
935
936 return unless $::CFG->{face_prefetch};
937
938 if ($self->{num_faces}) {
939 return if @{ $self->{send_queue} || [] };
940 my $todo = @{ $self->{face_prefetch} }
941 or return;
942
943 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
944
945 $self->send ("requestinfo image_sums $face $face");
946
947 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
948 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
949 } elsif (!exists $self->{num_faces}) {
950 $self->send ("requestinfo image_info");
951
952 $self->{num_faces} = 0;
953
954 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
955 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
956 }
957}
958
959sub update_floorbox { 977sub update_floorbox {
960 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 978 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
961 return unless $::CONN; 979 return unless $::CONN;
962 980
963 $::FLOORBOX->clear; 981 $::FLOORBOX->clear;
982
983 my @add;
964 984
965 my $row; 985 my $row;
966 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} }) {
967 if ($row < 6) { 987 if ($row < 6) {
968 local $_->{face_widget}; # hack to force recreation of widget 988 local $_->{face_widget}; # hack to force recreation of widget
969 local $_->{desc_widget}; # hack to force recreation of widget 989 local $_->{desc_widget}; # hack to force recreation of widget
970 CFPlus::Item::update_widgets $_; 990 CFPlus::Item::update_widgets $_;
971 991
992 push @add,
972 $::FLOORBOX->add (0, $row, $_->{face_widget}); 993 0, $row, $_->{face_widget},
973 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 994 1, $row, $_->{desc_widget};
974 995
975 $row++; 996 $row++;
976 } else { 997 } else {
977 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 998 push @add, 1, $row, new CFPlus::UI::Button
978 text => "More...", 999 text => "More...",
979 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1000 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
980 ); 1001 ;
981 last; 1002 last;
982 } 1003 }
983 } 1004 }
984 if ($::CONN->{open_container}) { 1005 if ($::CONN->{open_container}) {
985 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1006 push @add, 1, $row++, new CFPlus::UI::Button
986 text => "Close container", 1007 text => "Close container",
987 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1008 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
988 ); 1009 ;
989 } 1010 }
1011
1012 $::FLOORBOX->add_at (@add);
990 }); 1013 });
991 1014
992 $::WANT_REFRESH++; 1015 $::WANT_REFRESH++;
993} 1016}
994 1017
… …
1114 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1137 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1115 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1138 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1116 . "map size $self->{mapw}×$self->{maph}\n" 1139 . "map size $self->{mapw}×$self->{maph}\n"
1117 ); 1140 );
1118 1141
1119 ::setup_build_button ($self->{editor_support}->{builder_ui});
1120} 1142}
1121 1143
1122sub logged_in { 1144sub logged_in {
1123 my ($self) = @_; 1145 my ($self) = @_;
1124 1146
1125 $self->send_ext_req (cfplus_support => version => 1, sub { 1147 $self->send_ext_req (cfplus_support => version => 2, sub {
1148 my (%msg) = @_;
1149
1126 $self->{cfplus_ext} = $_[0]{version}; 1150 $self->{cfplus_ext} = $msg{version};
1127 $self->update_server_info; 1151 $self->update_server_info;
1128 1152
1129 if ($self->{cfplus_ext} >= 2) { 1153 if ($self->{cfplus_ext} >= 2) {
1130 $self->send_ext_req ("editor_support", sub { 1154 $self->send_ext_req ("editor_support", sub {
1131 $self->{editor_support} = $_[0]; 1155 $self->{editor_support} = { @_ };
1132 $self->update_server_info; 1156 $self->update_server_info;
1133 1157
1134 0 1158 0
1135 }); 1159 });
1136 } 1160 }
… …
1144 $self->send_command ("output-count $::CFG->{output_count}"); 1168 $self->send_command ("output-count $::CFG->{output_count}");
1145 $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;
1146 $self->send_command ("pickup $::CFG->{pickup}"); 1170 $self->send_command ("pickup $::CFG->{pickup}");
1147} 1171}
1148 1172
1149sub buildat {
1150 my ($self, $builditem, $x, $y) = @_;
1151
1152 if ($self->{cfplus_ext}) {
1153 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1154 }
1155}
1156
1157sub lookat { 1173sub lookat {
1158 my ($self, $x, $y) = @_; 1174 my ($self, $x, $y) = @_;
1159 1175
1160 if ($self->{cfplus_ext}) { 1176 if ($self->{cfplus_ext}) {
1161 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1177 $self->send_ext_req (lookat => $x, $y, sub {
1162 my ($msg) = @_; 1178 my (%msg) = @_;
1163 1179
1164 if (exists $msg->{npc_dialog}) { 1180 if (exists $msg{npc_dialog}) {
1165 # start npc chat dialog 1181 # start npc chat dialog
1166 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1182 $self->{npc_dialog} = new CFPlus::NPCDialog::
1167 dx => $x, 1183 token => $msg{npc_dialog},
1168 dy => $y,
1169 title => "$msg->{npc_dialog} (NPC)", 1184 title => "$msg{npc_dialog}[0] (NPC)",
1170 conn => $self, 1185 conn => $self,
1171 ; 1186 ;
1172 } 1187 }
1173 }); 1188 });
1174 } 1189 }
… …
1239 on_activate => sub { $this->destroy; 1 }, 1254 on_activate => sub { $this->destroy; 1 },
1240 ; 1255 ;
1241 1256
1242 $self->update_options; 1257 $self->update_options;
1243 1258
1244 $self->{id} = $self->{conn}->send_ext_req ( 1259 $self->{id} = "npc-channel-" . $self->{conn}->token;
1245 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1260 $self->{conn}->connect_ext ($self->{id} => sub {
1246 sub { $this && $this->feed (@_) } 1261 $this->feed (@_) if $this;
1247 ); 1262 });
1263
1264 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1248 1265
1249 $self->{entry}->grab_focus; 1266 $self->{entry}->grab_focus;
1250 1267
1251 $self->{textview}->add_paragraph ({ 1268 $self->{textview}->add_paragraph ({
1252 fg => [1, 1, 0, 1], 1269 fg => [1, 1, 0, 1],
… …
1275 ); 1292 );
1276 } 1293 }
1277} 1294}
1278 1295
1279sub feed { 1296sub feed {
1280 my ($self, $msg) = @_; 1297 my ($self, $type, @arg) = @_;
1281 1298
1282 CFPlus::weaken $self; 1299 CFPlus::weaken $self;
1283 1300
1284 if ($msg->{msgtype} eq "reply") { 1301 if ($type eq "update") {
1302 my (%info) = @arg;
1303
1285 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1304 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1286 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1305 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1287
1288 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1289 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1290 my @link;
1291 $text =~ s{
1292 ($match)
1293 }{
1294 my $kw = $1;
1295
1296 push @link, new CFPlus::UI::Label
1297 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1298 can_hover => 1,
1299 can_events => 1,
1300 padding_x => 0,
1301 padding_y => 0,
1302 on_button_up => sub {
1303 $self->send ($kw);
1304 };
1305
1306 "\x{fffc}"
1307 }giex;
1308 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
1309 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1329 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1310 $self->{textview}->scroll_to_bottom; 1330 $self->{textview}->scroll_to_bottom;
1331 }
1332
1311 $self->update_options; 1333 $self->update_options;
1312 } else { 1334 } else {
1313 $self->destroy; 1335 $self->destroy;
1314 } 1336 }
1315 1337
… …
1320 my ($self, $msg) = @_; 1342 my ($self, $msg) = @_;
1321 1343
1322 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1344 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1323 $self->{textview}->scroll_to_bottom; 1345 $self->{textview}->scroll_to_bottom;
1324 1346
1325 $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);
1326} 1348}
1327 1349
1328sub destroy { 1350sub destroy {
1329 my ($self) = @_; 1351 my ($self) = @_;
1330 1352
1331 #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
1332 1354
1333 if ($self->{conn}) { 1355 if ($self->{conn}) {
1334 $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};
1335 delete $self->{conn}{npc_dialog}; 1357 delete $self->{conn}{npc_dialog};
1336 $self->{conn}->disconnect_ext ($self->{id}); 1358 $self->{conn}->disconnect_ext ($self->{id});
1337 } 1359 }
1338 1360
1339 $self->SUPER::destroy; 1361 $self->SUPER::destroy;

Diff Legend

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