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

Diff Legend

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