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.120 by root, Sat Jul 14 13:04:42 2007 UTC vs.
Revision 1.138 by root, Sat Jul 28 16:48: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 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};
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 } else {
80 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
81 $self->ask_face ($face, -100 - $pri, undef, sub {
82 my $len = length $_[1];
83 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
84
85 CFPlus::DB::write_file $path, $data, sub {
86 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
87 my $meta = $self->{json_coder}->decode ($meta_json);
88 $meta->{path} = $path;
89 $self->{music_meta}{$chksum} = $meta;
90
91 ::message ({ markup => "downloaded song #$face, size $len octets" });
92 &::audio_music_set ($self->{songs});
93 };
94 };
95 });
96 }
97 }
98 }
99 }
100
101 if (my $play = $ev->{play}) {
102 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]); 56 &::audio_music_set ($self->{songs} = $ev->{play})
103 } 57 if $ev->{play};
104 }); 58 });
105 59
106 $self->connect_ext (event_capabilities => sub { 60 $self->connect_ext (capabilities => sub {
107 my ($cap) = @_; 61 my (%cap) = @_;
108 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
109 if (my $ts = $cap->{tileset}) { 70 if (my $ts = $cap{tileset}) {
110 if (my ($default) = grep $_->[2] & 1, @$ts) { 71 if (my ($default) = grep $_->[2] & 1, @$ts) {
111 $self->{tileset} = $default; 72 $self->{tileset} = $default;
112 $self->{tilesize} = $default->[3]; 73 $self->{tilesize} = $default->[3];
113 $self->setup_req (tileset => $default->[0]); 74 $self->setup_req (tileset => $default->[0]);
114 75
… …
120 } 81 }
121 }); 82 });
122 83
123 $self->{json_coder} 84 $self->{json_coder}
124 ->convert_blessed 85 ->convert_blessed
125 ->filter_json_single_key_object (__widget_ref__ => sub { 86 ->filter_json_single_key_object (__w_ => sub {
126 $self->{widget}{$_[0]} 87 $self->{widget}{$_[0]}
127 }); 88 });
128 89
90 # widgetset new
129 $self->connect_ext (ws_n => sub { 91 $self->connect_ext (ws_n => sub {
130 my ($arg) = @_; 92 my ($id) = @_;
131 93
132 $self->{widgetset}{$arg{id}} = { 94 $self->{widgetset}{$id} = {
133 w => {}, 95 w => {},
134 }; 96 };
135 }); 97 });
136 98
99 # widgetset destroy
137 $self->connect_ext (ws_d => sub { 100 $self->connect_ext (ws_d => sub {
138 my ($arg) = @_; 101 my ($id) = @_;
139 102
140 my $ws = delete $self->{widgetset}{$arg{id}} 103 my $ws = delete $self->{widgetset}{$id}
141 or return; 104 or return;
142 105
143 $_->destroy 106 $_->destroy
144 for values %{$ws->{w}}; 107 for values %{$ws->{w}};
145 }); 108 });
146 109
110 # widgetset create
147 $self->connect_ext (ws_c => sub { 111 $self->connect_ext (ws_c => sub {
148 my ($arg) = @_; 112 my ($ws, $id, $class, $args) = @_;
149
150 my $args = $arg->{args} || {};
151 113
152 for my $ev (grep /^on_/, keys %$args) { 114 for my $ev (grep /^on_/, keys %$args) {
153 $args->{$ev} = sub { 115 $args->{$ev} = sub {
154 my $id = shift->{s_id}; 116 my $id = shift->{s_id};
155 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 117 $self->send_exti_msg (w_e => $id, $ev, \@_);
156 118
157 1 119 1
158 }; 120 };
159 } 121 }
160 122
161 if (my $widget = eval { 123 if (my $widget = eval {
162 local $SIG{__DIE__}; 124 local $SIG{__DIE__};
163 "CFPlus::UI::$arg->{class}"->new ( 125 "CFPlus::UI::$class"->new (
164 %$args, 126 %$args,
165 s_ws => $arg->{ws}, 127 s_ws => $ws,
166 s_id => $arg->{id}, 128 s_id => $id,
167 ) 129 )
168 } 130 }
169 ) { 131 ) {
170 $self->{widget}{$arg->{id}} 132 $self->{widget}{$id}
171 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 133 = $self->{widgetset}{$ws}{w}{$id}
172 = $widget; 134 = $widget;
173 135
174 $widget->connect (on_destroy => sub { 136 $widget->connect (on_destroy => sub {
175 my ($widget) = @_; 137 my ($widget) = @_;
176 138
177 delete $self->{widget}{$widget->{s_id}}; 139 delete $self->{widget}{$widget->{s_id}};
178 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 140 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
179 }); 141 });
180 } else { 142 } else {
181 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";
182 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 144 $self->send_exti_msg (w_e => $id, "destroy");
183 } 145 }
184 }); 146 });
185 147
148 # widget call
186 $self->connect_ext (w_c => sub { 149 $self->connect_ext (w_c => sub {
187 my ($arg) = @_; 150 my ($id, $rid, $method, $args) = @_;
188 151
189 my $w = $self->{widget}{$arg->{id}} 152 my $w = $self->{widget}{$id}
190 or return; 153 or return;
191 my $m = $arg->{name};
192 154
193 my $a = $arg->{args} || []; 155 $args ||= [];
194 156
195 if (exists $arg->{rid}) { 157 if ($rid) {
196 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 158 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
197 } else { 159 } else {
198 $w->$m (@$a); 160 $w->$method (@$args);
199 } 161 }
200 }); 162 });
201 163
164 # widget set
202 $self->connect_ext (w_s => sub { 165 $self->connect_ext (w_s => sub {
203 my ($arg) = @_; 166 my ($id, $attr) = @_;
204 167
205 my $w = $self->{widget}{$arg->{id}} 168 my $w = $self->{widget}{$id}
206 or return; 169 or return;
207 170
208 $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 }
209 }); 180 });
210 181
182 # widget get
211 $self->connect_ext (w_g => sub { 183 $self->connect_ext (w_g => sub {
212 my ($arg) = @_; 184 my ($id, $rid, $attr) = @_;
213 185
214 my $w = $self->{widget}{$arg->{id}} 186 my $w = $self->{widget}{$id}
215 or return; 187 or return;
216 188
217 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 189 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
218 }); 190 });
219 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
220 $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 {
221 for my $ws (values %{delete $self->{widgetset} || {}}) { 201 for my $ws (values %{delete $self->{widgetset} || {}}) {
222 $_->destroy 202 $_->destroy
223 for values %{delete $ws->{w} || {}}; 203 for values %{delete $ws->{w} || {}};
224 } 204 }
… …
437 my @skills = keys %{ $self->{skill_info} }; 417 my @skills = keys %{ $self->{skill_info} };
438 418
439 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 419 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
440 $sktbl->clear; 420 $sktbl->clear;
441 421
422 my @add;
423
424 push @add,
442 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 425 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
443 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 426 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
444 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 427 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
445 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 428 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
446 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 429 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
447 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 430 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
431 ;
448 432
449 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>";
450 434
451 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);
452 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);
… …
480 } 464 }
481 465
482 1 466 1
483 }; 467 };
484 468
469 push @add,
485 $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
486 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),
487 $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
488 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),
489 $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,
490 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 ;
491 477
492 $x++ and ($x, $y) = (0, $y + 1); 478 $x++ and ($x, $y) = (0, $y + 1);
493 } 479 }
480
481 $sktbl->add_at (@add);
494 } 482 }
495 483
496 for (grep exists $stats->{$_}, @skills) { 484 for (grep exists $stats->{$_}, @skills) {
497 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 485 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
498 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 486 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
735} 723}
736 724
737sub face_find { 725sub face_find {
738 my ($self, $facenum, $face, $cb) = @_; 726 my ($self, $facenum, $face, $cb) = @_;
739 727
740 my $hash = "$face->{chksum},$face->{name}"; 728 if ($face->{type} == 0) { # FT_FACE
741
742 my $id = CFPlus::DB::get_tile_id_sync $hash; 729 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
743 730
744 $face->{id} = $id; 731 $face->{id} = $id;
745 $self->{faceid}[$facenum] = $id; 732 $self->{faceid}[$facenum] = $id;
746 733
747 $self->{map}->set_tileid ($facenum => $id); 734 $self->{map}->set_tileid ($facenum => $id);
748 735
749 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-metadata" => $face->{name}, $cb;
741 }
750} 742}
751 743
752sub face_update { 744sub face_update {
753 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
754 746
747 if ($face->{type} == 0) { # FT_FACE
755 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
756 if $changed; 749 if $changed;
757 750
758 $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 ($self->{songs});
764 };
765 }
766
767 my $path = CFPlus::DB::path_of_res $face->{name};
768
769 if ($changed) { # new data
770 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
771
772 CFPlus::DB::write_file $path, $data, sub {
773 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
774 $face->{meta} = $self->{json_coder}->decode ($meta_json);
775 $face->{path} = $path;
776
777 $cb->();
778 };
779 };
780 } else {
781 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
782 $face->{path} = $path;
783 $cb->();
784 }
785 }
759} 786}
760 787
761sub smooth_update { 788sub smooth_update {
762 my ($self, $facenum, $face) = @_; 789 my ($self, $facenum, $face) = @_;
763 790
… …
773 new_from_image CFPlus::Texture 800 new_from_image CFPlus::Texture
774 $data, minify => 1, mipmap => 1; 801 $data, minify => 1, mipmap => 1;
775 802
776 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 803 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
777 $self->{map_widget}->update; 804 $self->{map_widget}->update;
805
806 $_->() for @{(delete $self->{face_cb}{$id}) || []};
807}
808
809sub connect_face_update {
810 my ($self, $id, $cb) = @_;
811
812 push @{$self->{face_cb}{$id}}, $cb;
813
814 CFPlus::guard {
815 @{$self->{face_cb}{$id}}
816 = grep $_ != $cb,
817 @{$self->{face_cb}{$id}};
818 }
778} 819}
779 820
780sub sound_play { 821sub sound_play {
781 my ($self, $x, $y, $soundnum, $type) = @_; 822 my ($self, $x, $y, $soundnum, $type) = @_;
823 warn "sound play <@_>\n";#d#
782 824
783 $self->{sound_play}->($x, $y, $soundnum, $type); 825 #$self->{sound_play}->($x, $y, $soundnum, $type);
784} 826}
785 827
786my $LAST_QUERY; # server is stupid, stupid, stupid 828my $LAST_QUERY; # server is stupid, stupid, stupid
787 829
788sub query { 830sub query {
… …
853 $self->{$type} = $text; 895 $self->{$type} = $text;
854 } else { 896 } else {
855 $self->logprint ("msg: ", $text); 897 $self->logprint ("msg: ", $text);
856 return if $color < 0; # negative color == ignore if not understood 898 return if $color < 0; # negative color == ignore if not understood
857 899
858 my $fg = $CF_COLOR[$color % @CF_COLOR]; 900 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
859 901
860 ## try to create single paragraphs of multiple lines sent by the server 902 ## try to create single paragraphs of multiple lines sent by the server
861 # no longer neecssary with TRT servers 903 # no longer neecssary with TRT servers
862 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 904 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
863 905
864 ::message ({ fg => $fg, markup => $_ }) 906 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
865 for split /\n/, $text; 907 for split /\n/, $text;
866 908
867 $self->{statusbox}->add ($text, 909 $self->{statusbox}->add ($text,
868 group => $text, 910 group => $text,
869 fg => $fg, 911 fg => $fg,
… …
966 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1008 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
967 return unless $::CONN; 1009 return unless $::CONN;
968 1010
969 $::FLOORBOX->clear; 1011 $::FLOORBOX->clear;
970 1012
1013 my @add;
1014
971 my $row; 1015 my $row;
972 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1016 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
973 if ($row < 6) { 1017 if ($row < 6) {
974 local $_->{face_widget}; # hack to force recreation of widget 1018 local $_->{face_widget}; # hack to force recreation of widget
975 local $_->{desc_widget}; # hack to force recreation of widget 1019 local $_->{desc_widget}; # hack to force recreation of widget
976 CFPlus::Item::update_widgets $_; 1020 CFPlus::Item::update_widgets $_;
977 1021
1022 push @add,
978 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1023 0, $row, $_->{face_widget},
979 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1024 1, $row, $_->{desc_widget};
980 1025
981 $row++; 1026 $row++;
982 } else { 1027 } else {
983 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1028 push @add, 1, $row, new CFPlus::UI::Button
984 text => "More...", 1029 text => "More...",
985 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1030 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
986 ); 1031 ;
987 last; 1032 last;
988 } 1033 }
989 } 1034 }
990 if ($::CONN->{open_container}) { 1035 if ($::CONN->{open_container}) {
991 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1036 push @add, 1, $row++, new CFPlus::UI::Button
992 text => "Close container", 1037 text => "Close container",
993 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1038 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
994 ); 1039 ;
995 } 1040 }
1041
1042 $::FLOORBOX->add_at (@add);
996 }); 1043 });
997 1044
998 $::WANT_REFRESH++; 1045 $::WANT_REFRESH++;
999} 1046}
1000 1047
… …
1120 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1167 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1121 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1168 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1122 . "map size $self->{mapw}×$self->{maph}\n" 1169 . "map size $self->{mapw}×$self->{maph}\n"
1123 ); 1170 );
1124 1171
1125 ::setup_build_button ($self->{editor_support}->{builder_ui});
1126} 1172}
1127 1173
1128sub logged_in { 1174sub logged_in {
1129 my ($self) = @_; 1175 my ($self) = @_;
1130 1176
1131 $self->send_ext_req (cfplus_support => version => 1, sub { 1177 $self->send_ext_req (cfplus_support => version => 2, sub {
1178 my (%msg) = @_;
1179
1132 $self->{cfplus_ext} = $_[0]{version}; 1180 $self->{cfplus_ext} = $msg{version};
1133 $self->update_server_info; 1181 $self->update_server_info;
1134 1182
1135 if ($self->{cfplus_ext} >= 2) { 1183 if ($self->{cfplus_ext} >= 2) {
1136 $self->send_ext_req ("editor_support", sub { 1184 $self->send_ext_req ("editor_support", sub {
1137 $self->{editor_support} = $_[0]; 1185 $self->{editor_support} = { @_ };
1138 $self->update_server_info; 1186 $self->update_server_info;
1139 1187
1140 0 1188 0
1141 }); 1189 });
1142 } 1190 }
… …
1150 $self->send_command ("output-count $::CFG->{output_count}"); 1198 $self->send_command ("output-count $::CFG->{output_count}");
1151 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1199 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1152 $self->send_command ("pickup $::CFG->{pickup}"); 1200 $self->send_command ("pickup $::CFG->{pickup}");
1153} 1201}
1154 1202
1155sub buildat {
1156 my ($self, $builditem, $x, $y) = @_;
1157
1158 if ($self->{cfplus_ext}) {
1159 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1160 }
1161}
1162
1163sub lookat { 1203sub lookat {
1164 my ($self, $x, $y) = @_; 1204 my ($self, $x, $y) = @_;
1165 1205
1166 if ($self->{cfplus_ext}) { 1206 if ($self->{cfplus_ext}) {
1167 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1207 $self->send_ext_req (lookat => $x, $y, sub {
1168 my ($msg) = @_; 1208 my (%msg) = @_;
1169 1209
1170 if (exists $msg->{npc_dialog}) { 1210 if (exists $msg{npc_dialog}) {
1171 # start npc chat dialog 1211 # start npc chat dialog
1172 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1212 $self->{npc_dialog} = new CFPlus::NPCDialog::
1173 dx => $x, 1213 token => $msg{npc_dialog},
1174 dy => $y,
1175 title => "$msg->{npc_dialog} (NPC)", 1214 title => "$msg{npc_dialog}[0] (NPC)",
1176 conn => $self, 1215 conn => $self,
1177 ; 1216 ;
1178 } 1217 }
1179 }); 1218 });
1180 } 1219 }
… …
1245 on_activate => sub { $this->destroy; 1 }, 1284 on_activate => sub { $this->destroy; 1 },
1246 ; 1285 ;
1247 1286
1248 $self->update_options; 1287 $self->update_options;
1249 1288
1250 $self->{id} = $self->{conn}->send_ext_req ( 1289 $self->{id} = "npc-channel-" . $self->{conn}->token;
1251 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1290 $self->{conn}->connect_ext ($self->{id} => sub {
1252 sub { $this && $this->feed (@_) } 1291 $this->feed (@_) if $this;
1253 ); 1292 });
1293
1294 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1254 1295
1255 $self->{entry}->grab_focus; 1296 $self->{entry}->grab_focus;
1256 1297
1257 $self->{textview}->add_paragraph ({ 1298 $self->{textview}->add_paragraph ({
1258 fg => [1, 1, 0, 1], 1299 fg => [1, 1, 0, 1],
… …
1281 ); 1322 );
1282 } 1323 }
1283} 1324}
1284 1325
1285sub feed { 1326sub feed {
1286 my ($self, $msg) = @_; 1327 my ($self, $type, @arg) = @_;
1287 1328
1288 CFPlus::weaken $self; 1329 CFPlus::weaken $self;
1289 1330
1290 if ($msg->{msgtype} eq "reply") { 1331 if ($type eq "update") {
1332 my (%info) = @arg;
1333
1291 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1334 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1292 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1335 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1293
1294 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1295 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1296 my @link;
1297 $text =~ s{
1298 ($match)
1299 }{
1300 my $kw = $1;
1301
1302 push @link, new CFPlus::UI::Label
1303 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1304 can_hover => 1,
1305 can_events => 1,
1306 padding_x => 0,
1307 padding_y => 0,
1308 on_button_up => sub {
1309 $self->send ($kw);
1310 };
1311
1312 "\x{fffc}"
1313 }giex;
1314 1336
1337 if (exists $info{msg}) {
1338 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1339 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1340 my @link;
1341 $text =~ s{
1342 ($match)
1343 }{
1344 my $kw = $1;
1345
1346 push @link, new CFPlus::UI::Label
1347 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1348 can_hover => 1,
1349 can_events => 1,
1350 padding_x => 0,
1351 padding_y => 0,
1352 on_button_up => sub {
1353 $self->send ($kw);
1354 };
1355
1356 "\x{fffc}"
1357 }giex;
1358
1315 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1359 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1316 $self->{textview}->scroll_to_bottom; 1360 $self->{textview}->scroll_to_bottom;
1361 }
1362
1317 $self->update_options; 1363 $self->update_options;
1318 } else { 1364 } else {
1319 $self->destroy; 1365 $self->destroy;
1320 } 1366 }
1321 1367
… …
1326 my ($self, $msg) = @_; 1372 my ($self, $msg) = @_;
1327 1373
1328 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1374 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1329 $self->{textview}->scroll_to_bottom; 1375 $self->{textview}->scroll_to_bottom;
1330 1376
1331 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1377 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1332} 1378}
1333 1379
1334sub destroy { 1380sub destroy {
1335 my ($self) = @_; 1381 my ($self) = @_;
1336 1382
1337 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1383 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1338 1384
1339 if ($self->{conn}) { 1385 if ($self->{conn}) {
1340 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1386 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1341 delete $self->{conn}{npc_dialog}; 1387 delete $self->{conn}{npc_dialog};
1342 $self->{conn}->disconnect_ext ($self->{id}); 1388 $self->{conn}->disconnect_ext ($self->{id});
1343 } 1389 }
1344 1390
1345 $self->SUPER::destroy; 1391 $self->SUPER::destroy;

Diff Legend

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