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.123 by root, Thu Jul 19 16:44:14 2007 UTC vs.
Revision 1.143 by root, Tue Jul 31 02:03:13 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 "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev->{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 }); 56 });
106 57
107 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
108 my ($cap) = @_; 59 my (%cap) = @_;
109 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
110 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default; 70 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
115 73
… …
121 } 79 }
122 }); 80 });
123 81
124 $self->{json_coder} 82 $self->{json_coder}
125 ->convert_blessed 83 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 84 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]} 85 $self->{widget}{$_[0]}
128 }); 86 });
129 87
130 # widgetset new 88 # widgetset new
131 $self->connect_ext (ws_n => sub { 89 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_; 90 my ($id) = @_;
133 91
134 $self->{widgetset}{$arg{id}} = { 92 $self->{widgetset}{$id} = {
135 w => {}, 93 w => {},
136 }; 94 };
137 }); 95 });
138 96
139 # widgetset destroy 97 # widgetset destroy
140 $self->connect_ext (ws_d => sub { 98 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_; 99 my ($id) = @_;
142 100
143 my $ws = delete $self->{widgetset}{$arg{id}} 101 my $ws = delete $self->{widgetset}{$id}
144 or return; 102 or return;
145 103
146 $_->destroy 104 $_->destroy
147 for values %{$ws->{w}}; 105 for values %{$ws->{w}};
148 }); 106 });
149 107
150 # widgetset destroy 108 # widgetset create
151 $self->connect_ext (ws_c => sub { 109 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_; 110 my ($ws, $id, $class, $args) = @_;
153
154 my $args = $arg->{args} || {};
155 111
156 for my $ev (grep /^on_/, keys %$args) { 112 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub { 113 $args->{$ev} = sub {
158 my $id = shift->{s_id}; 114 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 115 $self->send_exti_msg (w_e => $id, $ev, \@_);
160 116
161 1 117 1
162 }; 118 };
163 } 119 }
164 120
165 if (my $widget = eval { 121 if (my $widget = eval {
166 local $SIG{__DIE__}; 122 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new ( 123 "CFPlus::UI::$class"->new (
168 %$args, 124 %$args,
169 s_ws => $arg->{ws}, 125 s_ws => $ws,
170 s_id => $arg->{id}, 126 s_id => $id,
171 ) 127 )
172 } 128 }
173 ) { 129 ) {
174 $self->{widget}{$arg->{id}} 130 $self->{widget}{$id}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 131 = $self->{widgetset}{$ws}{w}{$id}
176 = $widget; 132 = $widget;
177 133
178 $widget->connect (on_destroy => sub { 134 $widget->connect (on_destroy => sub {
179 my ($widget) = @_; 135 my ($widget) = @_;
180 136
181 delete $self->{widget}{$widget->{s_id}}; 137 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 }); 139 });
184 } else { 140 } else {
185 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";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 142 $self->send_exti_msg (w_e => $id, "destroy");
187 } 143 }
188 }); 144 });
189 145
190 # widget call 146 # widget call
191 $self->connect_ext (w_c => sub { 147 $self->connect_ext (w_c => sub {
192 my ($arg) = @_; 148 my ($id, $rid, $method, $args) = @_;
193 149
194 my $w = $self->{widget}{$arg->{id}} 150 my $w = $self->{widget}{$id}
195 or return; 151 or return;
196 my $m = $arg->{name};
197 152
198 my $a = $arg->{args} || []; 153 $args ||= [];
199 154
200 if (exists $arg->{rid}) { 155 if ($rid) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
202 } else { 157 } else {
203 $w->$m (@$a); 158 $w->$method (@$args);
204 } 159 }
205 }); 160 });
206 161
207 # widget set 162 # widget set
208 $self->connect_ext (w_s => sub { 163 $self->connect_ext (w_s => sub {
209 my ($arg) = @_; 164 my ($id, $attr) = @_;
210 165
211 my $w = $self->{widget}{$arg->{id}} 166 my $w = $self->{widget}{$id}
212 or return; 167 or return;
213 168
214 $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 }
215 }); 178 });
216 179
217 # widget get 180 # widget get
218 $self->connect_ext (w_g => sub { 181 $self->connect_ext (w_g => sub {
219 my ($arg) = @_; 182 my ($id, $rid, $attr) = @_;
220 183
221 my $w = $self->{widget}{$arg->{id}} 184 my $w = $self->{widget}{$id}
222 or return; 185 or return;
223 186
224 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
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);
225 }); 195 });
226 196
227 # destroy widgets on logout 197 # destroy widgets on logout
228 $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 {
229 for my $ws (values %{delete $self->{widgetset} || {}}) { 199 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
445 my @skills = keys %{ $self->{skill_info} }; 415 my @skills = keys %{ $self->{skill_info} };
446 416
447 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 417 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
448 $sktbl->clear; 418 $sktbl->clear;
449 419
420 my @add;
421
422 push @add,
450 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 423 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
451 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 424 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
452 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 425 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
453 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 426 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
454 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 427 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
455 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 428 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
429 ;
456 430
457 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>";
458 432
459 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);
460 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);
… …
488 } 462 }
489 463
490 1 464 1
491 }; 465 };
492 466
467 push @add,
493 $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
494 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),
495 $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
496 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),
497 $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,
498 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 ;
499 475
500 $x++ and ($x, $y) = (0, $y + 1); 476 $x++ and ($x, $y) = (0, $y + 1);
501 } 477 }
478
479 $sktbl->add_at (@add);
502 } 480 }
503 481
504 for (grep exists $stats->{$_}, @skills) { 482 for (grep exists $stats->{$_}, @skills) {
505 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 483 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
506 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 484 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
743} 721}
744 722
745sub face_find { 723sub face_find {
746 my ($self, $facenum, $face, $cb) = @_; 724 my ($self, $facenum, $face, $cb) = @_;
747 725
748 my $hash = "$face->{chksum},$face->{name}"; 726 if ($face->{type} == 0) { # FT_FACE
749
750 my $id = CFPlus::DB::get_tile_id_sync $hash; 727 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
751 728
752 $face->{id} = $id; 729 $face->{id} = $id;
753 $self->{faceid}[$facenum] = $id; 730 $self->{faceid}[$facenum] = $id;
754 731
755 $self->{map}->set_tileid ($facenum => $id); 732 $self->{map}->set_tileid ($facenum => $id);
756 733
757 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 }
758} 740}
759 741
760sub face_update { 742sub face_update {
761 my ($self, $facenum, $face, $changed) = @_; 743 my ($self, $facenum, $face, $changed) = @_;
762 744
745 if ($face->{type} == 0) { # FT_FACE
763 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
764 if $changed; 747 if $changed;
765 748
766 $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 $cb->();
781 };
782
783 } else {
784 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
785 $cb->();
786 }
787 }
767} 788}
768 789
769sub smooth_update { 790sub smooth_update {
770 my ($self, $facenum, $face) = @_; 791 my ($self, $facenum, $face) = @_;
771 792
… …
798 @{$self->{face_cb}{$id}}; 819 @{$self->{face_cb}{$id}};
799 } 820 }
800} 821}
801 822
802sub sound_play { 823sub sound_play {
803 my ($self, $x, $y, $soundnum, $type) = @_; 824 my ($self, $type, $face, $dx, $dy, $vol) = @_;
804 825
805 $self->{sound_play}->($x, $y, $soundnum, $type); 826 &::audio_sound_play ($face, $dx, $dy, $vol)
827 unless $type & 1; # odd types are silent for future expansion
806} 828}
807 829
808my $LAST_QUERY; # server is stupid, stupid, stupid 830my $LAST_QUERY; # server is stupid, stupid, stupid
809 831
810sub query { 832sub query {
… …
875 $self->{$type} = $text; 897 $self->{$type} = $text;
876 } else { 898 } else {
877 $self->logprint ("msg: ", $text); 899 $self->logprint ("msg: ", $text);
878 return if $color < 0; # negative color == ignore if not understood 900 return if $color < 0; # negative color == ignore if not understood
879 901
880 my $fg = $CF_COLOR[$color % @CF_COLOR]; 902 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
881 903
882 ## try to create single paragraphs of multiple lines sent by the server 904 ## try to create single paragraphs of multiple lines sent by the server
883 # no longer neecssary with TRT servers 905 # no longer neecssary with TRT servers
884 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 906 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
885 907
886 ::message ({ fg => $fg, markup => $_ }) 908 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
887 for split /\n/, $text; 909 for split /\n/, $text;
888 910
889 $self->{statusbox}->add ($text, 911 $self->{statusbox}->add ($text,
890 group => $text, 912 group => $text,
891 fg => $fg, 913 fg => $fg,
… …
948 $self->{map_widget}->clr_commands; 970 $self->{map_widget}->clr_commands;
949 971
950 ::stop_game (); 972 ::stop_game ();
951} 973}
952 974
953sub image_info {
954 my ($self, $numfaces) = @_;
955
956 $self->{num_faces} = $numfaces;
957 $self->{face_prefetch} = [1 .. $numfaces];
958 $self->face_prefetch;
959}
960
961sub face_prefetch {
962 my ($self) = @_;
963
964 return unless $::CFG->{face_prefetch};
965
966 if ($self->{num_faces}) {
967 return if @{ $self->{send_queue} || [] };
968 my $todo = @{ $self->{face_prefetch} }
969 or return;
970
971 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
972
973 $self->send ("requestinfo image_sums $face $face");
974
975 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
976 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
977 } elsif (!exists $self->{num_faces}) {
978 $self->send ("requestinfo image_info");
979
980 $self->{num_faces} = 0;
981
982 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
983 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
984 }
985}
986
987sub update_floorbox { 975sub update_floorbox {
988 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 976 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
989 return unless $::CONN; 977 return unless $::CONN;
990 978
991 $::FLOORBOX->clear; 979 $::FLOORBOX->clear;
980
981 my @add;
992 982
993 my $row; 983 my $row;
994 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 984 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
995 if ($row < 6) { 985 if ($row < 6) {
996 local $_->{face_widget}; # hack to force recreation of widget 986 local $_->{face_widget}; # hack to force recreation of widget
997 local $_->{desc_widget}; # hack to force recreation of widget 987 local $_->{desc_widget}; # hack to force recreation of widget
998 CFPlus::Item::update_widgets $_; 988 CFPlus::Item::update_widgets $_;
999 989
990 push @add,
1000 $::FLOORBOX->add (0, $row, $_->{face_widget}); 991 0, $row, $_->{face_widget},
1001 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 992 1, $row, $_->{desc_widget};
1002 993
1003 $row++; 994 $row++;
1004 } else { 995 } else {
1005 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 996 push @add, 1, $row, new CFPlus::UI::Button
1006 text => "More...", 997 text => "More...",
1007 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 998 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1008 ); 999 ;
1009 last; 1000 last;
1010 } 1001 }
1011 } 1002 }
1012 if ($::CONN->{open_container}) { 1003 if ($::CONN->{open_container}) {
1013 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1004 push @add, 1, $row++, new CFPlus::UI::Button
1014 text => "Close container", 1005 text => "Close container",
1015 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1006 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1016 ); 1007 ;
1017 } 1008 }
1009
1010 $::FLOORBOX->add_at (@add);
1018 }); 1011 });
1019 1012
1020 $::WANT_REFRESH++; 1013 $::WANT_REFRESH++;
1021} 1014}
1022 1015
… …
1142 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1135 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1143 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1136 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1144 . "map size $self->{mapw}×$self->{maph}\n" 1137 . "map size $self->{mapw}×$self->{maph}\n"
1145 ); 1138 );
1146 1139
1147 ::setup_build_button ($self->{editor_support}->{builder_ui});
1148} 1140}
1149 1141
1150sub logged_in { 1142sub logged_in {
1151 my ($self) = @_; 1143 my ($self) = @_;
1152 1144
1153 $self->send_ext_req (cfplus_support => version => 1, sub { 1145 $self->send_ext_req (cfplus_support => version => 2, sub {
1146 my (%msg) = @_;
1147
1154 $self->{cfplus_ext} = $_[0]{version}; 1148 $self->{cfplus_ext} = $msg{version};
1155 $self->update_server_info; 1149 $self->update_server_info;
1156 1150
1157 if ($self->{cfplus_ext} >= 2) { 1151 if ($self->{cfplus_ext} >= 2) {
1158 $self->send_ext_req ("editor_support", sub { 1152 $self->send_ext_req ("editor_support", sub {
1159 $self->{editor_support} = $_[0]; 1153 $self->{editor_support} = { @_ };
1160 $self->update_server_info; 1154 $self->update_server_info;
1161 1155
1162 0 1156 0
1163 }); 1157 });
1164 } 1158 }
… …
1172 $self->send_command ("output-count $::CFG->{output_count}"); 1166 $self->send_command ("output-count $::CFG->{output_count}");
1173 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1167 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1174 $self->send_command ("pickup $::CFG->{pickup}"); 1168 $self->send_command ("pickup $::CFG->{pickup}");
1175} 1169}
1176 1170
1177sub buildat {
1178 my ($self, $builditem, $x, $y) = @_;
1179
1180 if ($self->{cfplus_ext}) {
1181 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1182 }
1183}
1184
1185sub lookat { 1171sub lookat {
1186 my ($self, $x, $y) = @_; 1172 my ($self, $x, $y) = @_;
1187 1173
1188 if ($self->{cfplus_ext}) { 1174 if ($self->{cfplus_ext}) {
1189 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1175 $self->send_ext_req (lookat => $x, $y, sub {
1190 my ($msg) = @_; 1176 my (%msg) = @_;
1191 1177
1192 if (exists $msg->{npc_dialog}) { 1178 if (exists $msg{npc_dialog}) {
1193 # start npc chat dialog 1179 # start npc chat dialog
1194 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1180 $self->{npc_dialog} = new CFPlus::NPCDialog::
1195 dx => $x, 1181 token => $msg{npc_dialog},
1196 dy => $y,
1197 title => "$msg->{npc_dialog} (NPC)", 1182 title => "$msg{npc_dialog}[0] (NPC)",
1198 conn => $self, 1183 conn => $self,
1199 ; 1184 ;
1200 } 1185 }
1201 }); 1186 });
1202 } 1187 }
… …
1267 on_activate => sub { $this->destroy; 1 }, 1252 on_activate => sub { $this->destroy; 1 },
1268 ; 1253 ;
1269 1254
1270 $self->update_options; 1255 $self->update_options;
1271 1256
1272 $self->{id} = $self->{conn}->send_ext_req ( 1257 $self->{id} = "npc-channel-" . $self->{conn}->token;
1273 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1258 $self->{conn}->connect_ext ($self->{id} => sub {
1274 sub { $this && $this->feed (@_) } 1259 $this->feed (@_) if $this;
1275 ); 1260 });
1261
1262 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1276 1263
1277 $self->{entry}->grab_focus; 1264 $self->{entry}->grab_focus;
1278 1265
1279 $self->{textview}->add_paragraph ({ 1266 $self->{textview}->add_paragraph ({
1280 fg => [1, 1, 0, 1], 1267 fg => [1, 1, 0, 1],
… …
1303 ); 1290 );
1304 } 1291 }
1305} 1292}
1306 1293
1307sub feed { 1294sub feed {
1308 my ($self, $msg) = @_; 1295 my ($self, $type, @arg) = @_;
1309 1296
1310 CFPlus::weaken $self; 1297 CFPlus::weaken $self;
1311 1298
1312 if ($msg->{msgtype} eq "reply") { 1299 if ($type eq "update") {
1300 my (%info) = @arg;
1301
1313 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1302 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1314 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1303 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1315
1316 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1317 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1318 my @link;
1319 $text =~ s{
1320 ($match)
1321 }{
1322 my $kw = $1;
1323
1324 push @link, new CFPlus::UI::Label
1325 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1326 can_hover => 1,
1327 can_events => 1,
1328 padding_x => 0,
1329 padding_y => 0,
1330 on_button_up => sub {
1331 $self->send ($kw);
1332 };
1333
1334 "\x{fffc}"
1335 }giex;
1336 1304
1305 if (exists $info{msg}) {
1306 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1307 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1308 my @link;
1309 $text =~ s{
1310 ($match)
1311 }{
1312 my $kw = $1;
1313
1314 push @link, new CFPlus::UI::Label
1315 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1316 can_hover => 1,
1317 can_events => 1,
1318 padding_x => 0,
1319 padding_y => 0,
1320 on_button_up => sub {
1321 $self->send ($kw);
1322 };
1323
1324 "\x{fffc}"
1325 }giex;
1326
1337 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1327 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1338 $self->{textview}->scroll_to_bottom; 1328 $self->{textview}->scroll_to_bottom;
1329 }
1330
1339 $self->update_options; 1331 $self->update_options;
1340 } else { 1332 } else {
1341 $self->destroy; 1333 $self->destroy;
1342 } 1334 }
1343 1335
… …
1348 my ($self, $msg) = @_; 1340 my ($self, $msg) = @_;
1349 1341
1350 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1342 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1351 $self->{textview}->scroll_to_bottom; 1343 $self->{textview}->scroll_to_bottom;
1352 1344
1353 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1345 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1354} 1346}
1355 1347
1356sub destroy { 1348sub destroy {
1357 my ($self) = @_; 1349 my ($self) = @_;
1358 1350
1359 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1351 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1360 1352
1361 if ($self->{conn}) { 1353 if ($self->{conn}) {
1362 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1354 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1363 delete $self->{conn}{npc_dialog}; 1355 delete $self->{conn}{npc_dialog};
1364 $self->{conn}->disconnect_ext ($self->{id}); 1356 $self->{conn}->disconnect_ext ($self->{id});
1365 } 1357 }
1366 1358
1367 $self->SUPER::destroy; 1359 $self->SUPER::destroy;

Diff Legend

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