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.180 by root, Wed Dec 26 18:09:30 2007 UTC

1package CFPlus::Protocol; 1package CFPlus::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Deliantra::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB; 9use CFPlus::DB;
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro; 12use CFPlus::Macro;
13use CFPlus::Item; 13use CFPlus::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
18 16
19sub new { 17sub new {
20 my ($class, %arg) = @_; 18 my ($class, %arg) = @_;
21 19
22 my $self = $class->SUPER::new (%arg, 20 my $self = $class->SUPER::new (%arg,
23 setup_req => { 21 setup_req => {
24 extmap => 1, 22 extmap => 1,
25 excmd => 1, 23 excmd => 1,
26 ywidget => 1, 24 widget => 1,
27 %{$arg{setup_req} || {}}, 25 %{$arg{setup_req} || {}},
28 }, 26 },
29 ); 27 );
30 28
31 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
… …
48 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
49 @args 47 @args
50 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 49 CFPlus::Pod::find command => "*";
52 50
53 $self->connect_ext (event_music => sub {
54 my ($ev) = @_;
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
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 });
104
105 $self->connect_ext (event_capabilities => sub {
106 my ($cap) = @_;
107
108 if (my $ts = $cap->{tileset}) {
109 if (my ($default) = grep $_->[2] & 1, @$ts) {
110 $self->{tileset} = $default;
111 $self->{tilesize} = $default->[3];
112 $self->setup_req (tileset => $default->[0]);
113
114 my $w = int $self->{mapw} * 32 / $self->{tilesize};
115 my $h = int $self->{maph} * 32 / $self->{tilesize};
116
117 $self->setup_req (mapsize => "${w}x${h}");
118 }
119 }
120 });
121
122 $self->{json_coder} 51 $self->{json_coder}
123 ->convert_blessed 52 ->convert_blessed
124 ->filter_json_single_key_object (__widget_ref__ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
125 $self->{widget}{$_[0]} 54 $self->{widget}{$_[0]}
55 })
56 ->filter_json_single_key_object ("\fc" => sub {
57 my ($id) = @_;
58 sub {
59 $self->send_exti_msg (w_e => $id, @_);
60 }
126 }); 61 });
127 62
128 $self->connect_ext (ws_n => sub { 63 # destroy widgets on logout
129 my ($arg) = @_;
130
131 $self->{widgetset}{$arg{id}} = {
132 w => {},
133 };
134 });
135
136 $self->connect_ext (ws_d => sub {
137 my ($arg) = @_;
138
139 my $ws = delete $self->{widgetset}{$arg{id}}
140 or return;
141
142 $_->destroy
143 for values %{$ws->{w}};
144 });
145
146 $self->connect_ext (ws_c => sub {
147 my ($arg) = @_;
148
149 my $args = $arg->{args} || {};
150
151 for my $ev (grep /^on_/, keys %$args) {
152 $args->{$ev} = sub {
153 my $id = shift->{s_id};
154 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
155
156 1
157 };
158 }
159
160 if (my $widget = eval {
161 local $SIG{__DIE__};
162 "CFPlus::UI::$arg->{class}"->new (
163 %$args,
164 s_ws => $arg->{ws},
165 s_id => $arg->{id},
166 )
167 }
168 ) {
169 $self->{widget}{$arg->{id}}
170 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
171 = $widget;
172
173 $widget->connect (on_destroy => sub {
174 my ($widget) = @_;
175
176 delete $self->{widget}{$widget->{s_id}};
177 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
178 });
179 } else {
180 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
181 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
182 }
183 });
184
185 $self->connect_ext (w_c => sub {
186 my ($arg) = @_;
187
188 my $w = $self->{widget}{$arg->{id}}
189 or return;
190 my $m = $arg->{name};
191
192 my $a = $arg->{args} || [];
193
194 if (exists $arg->{rid}) {
195 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
196 } else {
197 $w->$m (@$a);
198 }
199 });
200
201 $self->connect_ext (w_s => sub {
202 my ($arg) = @_;
203
204 my $w = $self->{widget}{$arg->{id}}
205 or return;
206
207 $w->{$arg->{name}} = $arg->{value};
208 });
209
210 $self->connect_ext (w_g => sub {
211 my ($arg) = @_;
212
213 my $w = $self->{widget}{$arg->{id}}
214 or return;
215
216 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
217 });
218
219 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
220 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
221 $_->destroy 66 $_->destroy
222 for values %{delete $ws->{w} || {}}; 67 for values %{delete $ws->{w} || {}};
223 } 68 }
… …
244 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
245 90
246 $self 91 $self
247} 92}
248 93
94sub update_fx_want {
95 my ($self) = @_;
96
97 $self->send_exti_msg (fx_want => {
98 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
100 6 => 1, # FT_RSRC
101 });
102}
103
104sub ext_capabilities {
105 my ($self, %cap) = @_;
106
107 #$self->send ("setup sound 0"); # we use a different protocol
108 $self->update_fx_want;
109
110 $self->send_exti_req (resource => "exp_table", sub {
111 my ($exp_table) = @_;
112
113 $self->register_face_handler ($exp_table, sub {
114 my ($face) = @_;
115
116 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
117 $_->() for values %{ $self->{on_exp_update} || {} };
118 });
119
120 ()
121 });
122
123 if (my $ts = $cap{tileset}) {
124 if (my ($default) = grep $_->[2] & 1, @$ts) {
125 $self->{tileset} = $default;
126 $self->{tilesize} = $default->[3];
127 $self->setup_req (tileset => $default->[0]);
128
129 my $w = int $self->{mapw} * 32 / $self->{tilesize};
130 my $h = int $self->{maph} * 32 / $self->{tilesize};
131
132 $self->setup_req (mapsize => "${w}x${h}");
133 }
134 }
135}
136
137sub ext_ambient_music {
138 my ($self, $songs) = @_;
139 &::audio_music_set_ambient ($songs);
140}
141
142#############################################################################
143
144sub widget_associate {
145 my ($self, $ws, $id, $widget) = @_;
146
147 $widget ||= new CFPlus::UI::Bin;
148
149 $widget->{s_id} = $id;
150 $self->{widget}{$id} = $widget;
151
152 if ($ws) {
153 $widget->{s_ws} = $ws;
154 $self->{widgetset}{$ws}{w}{$id} = $widget;
155 }
156
157 $widget->connect (on_destroy => sub {
158 my ($widget) = @_;
159
160 delete $self->{widget}{$widget->{s_id}};
161 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
162 if exists $widget->{s_ws};
163 });
164}
165
166# widgetset new
167sub ext_ws_n {
168 my ($self, $id) = @_;
169
170 $self->{widgetset}{$id} = {
171 w => {},
172 };
173}
174
175# widgetset destroy
176sub ext_ws_d {
177 my ($self, $id) = @_;
178
179 my $ws = delete $self->{widgetset}{$id}
180 or return;
181
182 $_->destroy
183 for values %{$ws->{w}};
184}
185
186# widgetset create
187sub ext_ws_c {
188 my ($self, $ws, $id, $class, $args) = @_;
189
190 $self->widget_associate (
191 $ws, $id => scalar eval {
192 local $SIG{__DIE__};
193 "CFPlus::UI::$class"->new (%$args)
194 }
195 );
196}
197
198# widgetset associate
199sub ext_ws_a {
200 my ($self, %ass) = @_;
201
202 # everything that has a name, wether conceivably useful or not
203 my %wkw = (
204 root => $CFPlus::UI::ROOT,
205 tooltip => $CFPlus::UI::TOOLTIP,
206
207 mapwidget => $::MAPWIDGET,
208 buttonbar => $::BUTTONBAR,
209 metaserver => $::METASERVER,
210 buttonbar => $::BUTTONBAR,
211 login_button => $::LOGIN_BUTTON,
212 quit_dialog => $::QUIT_DIALOG,
213 host_entry => $::HOST_ENTRY,
214 metaserver => $::METASERVER,
215 server_info => $::SERVER_INFO,
216
217 setup_dialog => $::SETUP_DIALOG,
218 setup_notebook => $::SETUP_NOTEBOOK,
219 setup_server => $::SETUP_SERVER,
220 setup_keyboard => $::SETUP_KEYBOARD,
221
222 pl_notebook => $::PL_NOTEBOOK,
223 pl_window => $::PL_WINDOW,
224 inventory_page => $::INVENTORY_PAGE,
225 stats_page => $::STATS_PAGE,
226 skill_page => $::SKILL_PAGE,
227 spell_page => $::SPELL_PAGE,
228 spell_list => $::SPELL_LIST,
229
230 floorbox => $::FLOORBOX,
231 help_window => $::HELP_WINDOW,
232 message_window => $::MESSAGE_WINDOW,
233 statusbox => $::SDTATUSBOX,
234
235 inv => $::INV,
236 invr => $::INVR,
237 invr_hb => $::INVR_HB,
238 );
239
240 while (my ($id, $name) = each %ass) {
241 $self->widget_associate (undef, $id => $wkw{$name});
242 }
243}
244
245# widget call
246sub ext_w_c {
247 my ($self, $id, $rcb, $method, @args) = @_;
248
249 my $w = $self->{widget}{$id}
250 or return;
251
252 if ($rcb) {
253 $rcb->($w->$method (@args));
254 } else {
255 $w->$method (@args);
256 }
257}
258
259# widget set
260sub ext_w_s {
261 my ($self, $id, $attr) = @_;
262
263 my $w = $self->{widget}{$id}
264 or return;
265
266 for (my $i = 0; $i < $#$attr; $i += 2) {
267 my ($member, $value) = @$attr[$i, $i+1];
268 if (defined $value) {
269 $w->{$member} = $value;
270 } else {
271 delete $w->{$member};
272 }
273 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
274 }
275}
276
277# widget get
278sub ext_w_g {
279 my ($self, $id, $rid, @attr) = @_;
280
281 my $w = $self->{widget}{$id}
282 or return;
283
284 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
285}
286
287# message window
288sub ext_channel_info {
289 my ($self, $info) = @_;
290 $self->{channels}->{$info->{id}} = $info;
291 $::MESSAGE_WINDOW->add_channel ($info);
292}
293
294#############################################################################
295
249sub logprint { 296sub logprint {
250 my ($self, @a) = @_; 297 my ($self, @a) = @_;
251 298
252 $self->{log_fh} ||= do { 299 CFPlus::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
253 my $path = "$Crossfire::VARDIR/log.$self->{host}";
254
255 open my $fh, ">>:utf8", $path
256 or die "Couldn't open logfile $path: $!";
257
258 $fh->autoflush (1);
259
260 $fh;
261 };
262
263 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
264
265 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
266 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
267
268 print {$self->{log_fh}} "$ts ", @a, "\n";
269} 300}
270 301
271sub _stat_numdiff { 302sub _stat_numdiff {
272 my ($self, $name, $old, $new) = @_; 303 my ($self, $name, $old, $new) = @_;
273 304
… …
357 388
358 if ( 389 if (
359 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 390 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
360 ) { 391 ) {
361 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 392 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
362 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 393 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
363 } 394 }
364 395
365 $self->update_stats_window ($stats, $prev); 396 $self->update_stats_window ($stats, $prev);
366 397
367 $self->{prev_stats} = { %$stats }; 398 $self->{prev_stats} = { %$stats };
… …
406 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 437 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
407 $::GAUGES->{food} ->set_value ($fo, $fo_m); 438 $::GAUGES->{food} ->set_value ($fo, $fo_m);
408 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 439 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
409 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 440 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
410 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 441 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
442 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
411 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 443 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
412 my $title = $stats->{+CS_STAT_TITLE}; 444 my $title = $stats->{+CS_STAT_TITLE};
413 $title =~ s/^Player: //; 445 $title =~ s/^Player: //;
414 $::STATWIDS->{title} ->set_text ("Title: " . $title); 446 $::STATWIDS->{title} ->set_text ("Title: " . $title);
415 447
… …
433 for keys %RES_TBL; 465 for keys %RES_TBL;
434 466
435 my $sktbl = $::STATWIDS->{skill_tbl}; 467 my $sktbl = $::STATWIDS->{skill_tbl};
436 my @skills = keys %{ $self->{skill_info} }; 468 my @skills = keys %{ $self->{skill_info} };
437 469
438 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 470 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
471 map [$_, $self->{skill_info}{$_}],
472 grep exists $stats->{$_},
473 @skills;
474
475 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
476 $self->{stat_order} = join ",", map $_->[0], @order;
477
439 $sktbl->clear; 478 $sktbl->clear;
440 479
480 my $sw = $self->{skillwid}{""} ||= [
441 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 481 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
442 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 482 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
483 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
443 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 484 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
444 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 485 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
445 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 486 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
487 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
446 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 488 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
489 ];
490
491 my @add = @$sw;
447 492
448 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 493 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
449 494
450 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 495 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); 496 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
452 497
453 my ($x, $y) = (0, 1); 498 my ($x, $y) = (0, 1);
454 for ( 499 for (@order) {
455 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
456 map [$_, $self->{skill_info}{$_}],
457 grep exists $stats->{$_},
458 @skills
459 ) {
460 my ($idx, $name) = @$_; 500 my ($idx, $name) = @$_;
461 501
462 my $spell_cb = sub { 502 my $spell_cb = sub {
463 my ($widget, $ev) = @_; 503 my ($widget, $ev) = @_;
464 504
… …
479 } 519 }
480 520
481 1 521 1
482 }; 522 };
483 523
484 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 524 my $sw = $self->{skillwid}{$idx} ||= [
525 # exp
526 (new CFPlus::UI::Label
485 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 527 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 528
529 # level
530 (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); 531 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
532
533 # progress
534 (new CFPlus::UI::ExperienceProgress),
535
536 # label
488 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 537 (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); 538 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
539 ];
540
541 push @add,
542 $x * 4 + 0, $y, $sw->[0],
543 $x * 4 + 1, $y, $sw->[1],
544 $x * 4 + 2, $y, $sw->[2],
545 $x * 4 + 3, $y, $sw->[3],
546 ;
490 547
491 $x++ and ($x, $y) = (0, $y + 1); 548 $x++ and ($x, $y) = (0, $y + 1);
492 } 549 }
493 }
494 550
495 for (grep exists $stats->{$_}, @skills) { 551 $sktbl->add_at (@add);
496 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
497 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
498 } 552 }
499}
500 553
501sub macro_send { 554 for (@order) {
502 my ($self, $macro) = @_; 555 my ($idx, $name) = @$_;
556 my $val = $stats->{$idx};
503 557
504 for my $cmd (@{ $macro->{action} }) { 558 next if $prev->{$idx}[1] eq $val->[1];
505 $self->send_command ($cmd); 559
560 my $sw = $self->{skillwid}{$idx};
561 $sw->[0]->set_text (::formsep ($val->[1]));
562 $sw->[1]->set_text ($val->[0] * 1);
563 $sw->[2]->set_value (@$val);
564
565 $::GAUGES->{sklprg}->set_label ("$name %d%%");
566 $::GAUGES->{sklprg}->set_value (@$val);
506 } 567 }
507} 568}
508 569
509sub user_send { 570sub user_send {
510 my ($self, $command) = @_; 571 my ($self, $command) = @_;
… …
512 $self->{record}->($command) 573 $self->{record}->($command)
513 if $self->{record}; 574 if $self->{record};
514 575
515 $self->logprint ("send: ", $command); 576 $self->logprint ("send: ", $command);
516 $self->send_command ($command); 577 $self->send_command ($command);
517 ::status ($command);
518} 578}
519 579
520sub record { 580sub record {
521 my ($self, $cb) = @_; 581 my ($self, $cb) = @_;
522 582
… …
530} 590}
531 591
532sub feed_map1a { 592sub feed_map1a {
533 my ($self, $data) = @_; 593 my ($self, $data) = @_;
534 594
535 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 595 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
596 my $delay;
597
598 for my $tile (@$missing) {
599 next if $self->{delay}{$tile};
600
601 $delay = 1;
602
603 if (my $tex = $::CONN->{texture}[$tile]) {
604 $tex->upload;
605 } else {
606 $self->{delay}{$tile} = 1;
607
608 # we assume the face is in-flight and will eventually come
609 push @{$self->{tile_cb}{$tile}}, sub {
610 delete $self->{delay}{$tile};
611 $_[0]->upload;
612 };
613 }
614 }
615
616 if ($delay) {
617 # delay the map drawing a tiny bit in the hope of getting the missing fetched
618 EV::once undef, 0, 0.03, sub {
619 $self->{map_widget}->update
620 if $self->{map_widget};
621 };
622 } else {
536 $self->{map_widget}->update; 623 $self->{map_widget}->update;
624 }
537} 625}
538 626
539sub magicmap { 627sub magicmap {
540 my ($self, $w, $h, $x, $y, $data) = @_; 628 my ($self, $w, $h, $x, $y, $data) = @_;
541 629
… …
548 my $map_info = delete $self->{map_info} 636 my $map_info = delete $self->{map_info}
549 or return; 637 or return;
550 638
551 my ($hash, $x, $y, $w, $h) = @$map_info; 639 my ($hash, $x, $y, $w, $h) = @$map_info;
552 640
553 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 641 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
642 $self->{map_cache_new}{$hash} = \$data;
554 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 643 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
555 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
556} 644}
557 645
558sub map_clear { 646sub map_clear {
559 my ($self) = @_; 647 my ($self) = @_;
560 648
… …
566} 654}
567 655
568sub bg_fetch { 656sub bg_fetch {
569 my ($self) = @_; 657 my ($self) = @_;
570 658
571 my $id; 659 my $tile;
572 660
573 do { 661 do {
574 $id = pop @{$self->{bg_fetch}} 662 $tile = pop @{$self->{bg_fetch}}
575 or return; 663 or return;
576 } while $self->{texture}[$id]; 664 } while $self->{texture}[$tile];
577 665
578 CFPlus::DB::get tilecache => $id, sub { 666 CFPlus::DB::get tilecache => $tile, sub {
579 my ($data) = @_; 667 my ($data) = @_;
580 668
581 return unless $self->{map}; # stop when destroyed 669 return unless $self->{map}; # stop when destroyed
582 670
583 $self->set_texture ($id => $data)
584 if defined $data; 671 if (defined $data) {
672 $self->have_tile ($tile, $data);
673 $self->{texture}[$tile]->upload;
674 }
585 675
586 $self->bg_fetch; 676 $self->bg_fetch;
587 }; 677 };
588} 678}
589 679
590sub load_map($$$) { 680sub load_map($$$) {
591 my ($self, $hash, $x, $y) = @_; 681 my ($self, $hash, $x, $y) = @_;
592 682
593 my $gen = $self->{map_change_gen}; 683 my $gen = $self->{map_change_gen};
594 684
595 CFPlus::DB::get $self->{mapcache} => $hash, sub { 685 my $cb = sub {
596 return unless $gen == $self->{map_change_gen}; 686 return unless $gen == $self->{map_change_gen};
597 687
598 my ($data) = @_; 688 my ($data) = @_;
599 689
600 if (defined $data) { 690 if (defined $data) {
691 $self->{map_cache_new}{$hash} = \$data;
692
601 $data = Compress::LZF::decompress $data; 693 my $data = Compress::LZF::decompress $data;
602 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
603 694
604 my $inprogress = @{ $self->{bg_fetch} || [] }; 695 my $inprogress = @{ $self->{bg_fetch} || [] };
605 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 696 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
606 $self->bg_fetch unless $inprogress; 697 $self->bg_fetch unless $inprogress;
607 } 698 }
608 }; 699 };
700
701 if (my $rdata = $self->{map_cache_old}{$hash}) {
702 $cb->($$rdata);
703 } else {
704 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
705 }
609} 706}
610 707
611# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 708# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
612# (server resource,s latency, bandwidth), so this hack is warranted. 709# (server resource,s latency, bandwidth), so this hack is warranted.
613# the right fix is to make real tiled maps with an overview file 710# the right fix is to make real tiled maps with an overview file
… …
706 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 803 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
707 804
708 $self->flush_map; 805 $self->flush_map;
709 806
710 ++$self->{map_change_gen}; 807 ++$self->{map_change_gen};
808 $self->{map_cache_old} = delete $self->{map_cache_new};
711 809
712 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 810 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
713 811
714 my $mapmapw = $self->{mapmap}->{w}; 812 my $mapmapw = $self->{mapmap}->{w};
715 my $mapmaph = $self->{mapmap}->{h}; 813 my $mapmaph = $self->{mapmap}->{h};
… …
734} 832}
735 833
736sub face_find { 834sub face_find {
737 my ($self, $facenum, $face, $cb) = @_; 835 my ($self, $facenum, $face, $cb) = @_;
738 836
739 my $hash = "$face->{chksum},$face->{name}"; 837 if ($face->{type} == 0) { # FT_FACE
740
741 my $id = CFPlus::DB::get_tile_id_sync $hash; 838 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
742 839
743 $face->{id} = $id; 840 $face->{id} = $id;
744 $self->{faceid}[$facenum] = $id;
745
746 $self->{map}->set_tileid ($facenum => $id); 841 $self->{map}->set_tileid ($facenum => $id);
747 842
748 CFPlus::DB::get tilecache => $id, $cb; 843 CFPlus::DB::get tilecache => $id, $cb;
844
845 } elsif ($face->{type} & 1) { # with metadata
846 CFPlus::DB::get res_meta => $face->{name}, $cb;
847
848 } else { # no metadata
849 CFPlus::DB::get res_data => $face->{name}, $cb;
850 }
749} 851}
750 852
751sub face_update { 853sub face_update {
752 my ($self, $facenum, $face, $changed) = @_; 854 my ($self, $facenum, $face, $changed) = @_;
753 855
856 if ($face->{type} == 0) {
857 # image, FT_FACE
754 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 858 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
755 if $changed; 859 if $changed;
756 860
757 $self->set_texture ($face->{id} => delete $face->{image}); 861 $self->have_tile ($face->{id}, delete $face->{data});
862
863 } elsif ($face->{type} & 1) {
864 # split metadata case, FT_MUSIC, FT_SOUND
865 if ($changed) { # new data
866 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
867 $face->{data} = $meta;
868
869 # rely on strict ordering here and also on later fetch
870 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
871 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
872 }
873
874 $face->{data} = $self->{json_coder}->decode ($face->{data});
875 ::add_license ($face);
876 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
877 if $changed;
878
879 if ($face->{type} == 3) { # FT_MUSIC
880 &::audio_music_push ($facenum);
881 } elsif ($face->{type} == 5) { # FT_SOUND
882 &::audio_sound_push ($facenum);
883 }
884
885 } else {
886 # flat resource case, FT_RSRC
887 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
888 if $changed;
889 }
890
891 if (my $cbs = $self->{face_cb}{$facenum}) {
892 $_->($face, $changed) for @$cbs;
893 }
758} 894}
759 895
760sub smooth_update { 896sub smooth_update {
761 my ($self, $facenum, $face) = @_; 897 my ($self, $facenum, $face) = @_;
762 898
763 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 899 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
764} 900}
765 901
766sub set_texture { 902sub have_tile {
767 my ($self, $id, $data) = @_; 903 my ($self, $tile, $data) = @_;
768 904
769 return unless $self->{map}; 905 return unless $self->{map};
770 906
771 $self->{texture}[$id] = my $tex = 907 my $tex = $self->{texture}[$tile] ||=
772 new_from_image CFPlus::Texture 908 new CFPlus::Texture
909 tile => $tile,
910 image => $data, delete_image => 1,
773 $data, minify => 1, mipmap => 1; 911 minify => 1, mipmap => 1;
774 912
775 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 913 if (my $cbs = delete $self->{tile_cb}{$tile}) {
776 $self->{map_widget}->update; 914 $_->($tex) for @$cbs;
915 }
916}
917
918# call in non-void context registers a temporary
919# hook with handle, otherwise its permanent
920sub on_face_change {
921 my ($self, $num, $cb) = @_;
922
923 push @{$self->{face_cb}{$num}}, $cb;
924
925 defined wantarray
926 ? CFPlus::guard {
927 @{$self->{face_cb}{$num}}
928 = grep $_ != $cb,
929 @{$self->{face_cb}{$num}};
930 }
931 : ()
932}
933
934# call in non-void context registers a temporary
935# hook with handle, otherwise its permanent
936sub register_face_handler {
937 my ($self, $num, $cb) = @_;
938
939 return unless $num;
940
941 # invoke if available right now
942 $cb->($self->{face}[$num], 0)
943 unless exists $self->{face}[$num]{loading};
944
945 # future changes
946 $self->on_face_change ($num => $cb)
777} 947}
778 948
779sub sound_play { 949sub sound_play {
780 my ($self, $x, $y, $soundnum, $type) = @_; 950 my ($self, $type, $face, $dx, $dy, $vol) = @_;
781 951
782 $self->{sound_play}->($x, $y, $soundnum, $type); 952 &::audio_sound_play ($face, $dx, $dy, $vol)
953 unless $type & 1; # odd types are silent for future expansion
783} 954}
784 955
785my $LAST_QUERY; # server is stupid, stupid, stupid 956my $LAST_QUERY; # server is stupid, stupid, stupid
786 957
787sub query { 958sub query {
… …
795 966
796sub sanitise_xml($) { 967sub sanitise_xml($) {
797 local $_ = shift; 968 local $_ = shift;
798 969
799 # we now weed out all tags we do not support 970 # we now weed out all tags we do not support
800 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 971 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
972 }{
973 "&lt;"
974 }gex;
975
801 # now all entities 976 # now all entities
802 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 977 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
803 978
804 # handle some elements 979 # handle some elements
805 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 980 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
852 $self->{$type} = $text; 1027 $self->{$type} = $text;
853 } else { 1028 } else {
854 $self->logprint ("msg: ", $text); 1029 $self->logprint ("msg: ", $text);
855 return if $color < 0; # negative color == ignore if not understood 1030 return if $color < 0; # negative color == ignore if not understood
856 1031
857 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1032 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
858 1033
859 ## try to create single paragraphs of multiple lines sent by the server 1034 ## try to create single paragraphs of multiple lines sent by the server
860 # no longer neecssary with TRT servers 1035 # no longer neecssary with TRT servers
861 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1036 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
862 1037
863 ::message ({ fg => $fg, markup => $_ })
864 for split /\n/, $text; 1038 for (split /\n/, $text) {
1039 ::message ({
1040 fg => $fg,
1041 markup => $_,
1042 type => $type,
1043 extra => [@extra],
1044 color_flags => $color, #d# ugly, kill
1045 });
1046
1047 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1048 # actually, this is an ugly design. _we_ should control the channels,
1049 # not some random other widget, as the channels are clearly protocol-specific.
1050 # then we could also react to flags such as CLEAR without resorting to
1051 # hacks such as color_flags, above.
1052 }
865 1053
866 $self->{statusbox}->add ($text, 1054 $self->{statusbox}->add ($text,
867 group => $text, 1055 group => $text,
868 fg => $fg, 1056 fg => $fg,
869 timeout => $color >= 2 ? 180 : 10, 1057 timeout => $color >= 2 ? 180 : 10,
870 tooltip_font => $::FONT_FIXED, 1058 tooltip_font => $::FONT_FIXED,
871 ); 1059 ) if $type eq "info";
872 } 1060 }
873} 1061}
874 1062
875sub spell_add { 1063sub spell_add {
876 my ($self, $spell) = @_; 1064 my ($self, $spell) = @_;
… …
925 $self->{map_widget}->clr_commands; 1113 $self->{map_widget}->clr_commands;
926 1114
927 ::stop_game (); 1115 ::stop_game ();
928} 1116}
929 1117
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 { 1118sub update_floorbox {
965 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1119 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
966 return unless $::CONN; 1120 return unless $::CONN;
967 1121
968 $::FLOORBOX->clear; 1122 $::FLOORBOX->clear;
1123
1124 my @add;
969 1125
970 my $row; 1126 my $row;
971 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1127 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
972 if ($row < 6) { 1128 if ($row < 6) {
973 local $_->{face_widget}; # hack to force recreation of widget 1129 local $_->{face_widget}; # hack to force recreation of widget
974 local $_->{desc_widget}; # hack to force recreation of widget 1130 local $_->{desc_widget}; # hack to force recreation of widget
975 CFPlus::Item::update_widgets $_; 1131 CFPlus::Item::update_widgets $_;
976 1132
1133 push @add,
977 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1134 0, $row, $_->{face_widget},
978 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1135 1, $row, $_->{desc_widget};
979 1136
980 $row++; 1137 $row++;
981 } else { 1138 } else {
982 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1139 push @add, 1, $row, new CFPlus::UI::Button
983 text => "More...", 1140 text => "More...",
984 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
985 ); 1142 ;
986 last; 1143 last;
987 } 1144 }
988 } 1145 }
989 if ($::CONN->{open_container}) { 1146 if ($::CONN->{open_container}) {
990 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1147 push @add, 1, $row++, new CFPlus::UI::Button
991 text => "Close container", 1148 text => "Close container",
992 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
993 ); 1150 ;
994 } 1151 }
1152
1153 $::FLOORBOX->add_at (@add);
995 }); 1154 });
996 1155
997 $::WANT_REFRESH++; 1156 $::WANT_REFRESH->start;
998} 1157}
999 1158
1000sub set_opencont { 1159sub set_opencont {
1001 my ($conn, $tag, $name) = @_; 1160 my ($conn, $tag, $name) = @_;
1002 $conn->{open_container} = $tag; 1161 $conn->{open_container} = $tag;
1003 update_floorbox; 1162 update_floorbox;
1004 1163
1005 $::INV_RIGHT_HB->clear (); 1164 $::INVR_HB->clear ();
1006 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1165 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1007 1166
1008 if ($tag != 0) { # Floor isn't closable, is it? 1167 if ($tag != 0) { # Floor isn't closable, is it?
1009 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1168 $::INVR_HB->add (new CFPlus::UI::Button
1010 text => "Close container", 1169 text => "Close container",
1011 tooltip => "Close the currently open container (if one is open)", 1170 tooltip => "Close the currently open container (if one is open)",
1012 on_activate => sub { 1171 on_activate => sub {
1013 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1014 if $tag != 0; 1173 if $tag != 0;
1015 #if $CONN->{open_container} != 0;
1016 0 1174 0
1017 }, 1175 },
1018 ); 1176 );
1019 } 1177 }
1020 1178
… …
1119 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1277 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1120 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1278 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1121 . "map size $self->{mapw}×$self->{maph}\n" 1279 . "map size $self->{mapw}×$self->{maph}\n"
1122 ); 1280 );
1123 1281
1124 ::setup_build_button ($self->{editor_support}->{builder_ui});
1125} 1282}
1126 1283
1127sub logged_in { 1284sub logged_in {
1128 my ($self) = @_; 1285 my ($self) = @_;
1129 1286
1130 $self->send_ext_req (cfplus_support => version => 1, sub { 1287 $self->send_ext_req (cfplus_support => version => 2, sub {
1288 my (%msg) = @_;
1289
1131 $self->{cfplus_ext} = $_[0]{version}; 1290 $self->{cfplus_ext} = $msg{version};
1132 $self->update_server_info; 1291 $self->update_server_info;
1133 1292
1134 if ($self->{cfplus_ext} >= 2) { 1293 if ($self->{cfplus_ext} >= 2) {
1135 $self->send_ext_req ("editor_support", sub { 1294 $self->send_ext_req ("editor_support", sub {
1136 $self->{editor_support} = $_[0]; 1295 $self->{editor_support} = { @_ };
1137 $self->update_server_info; 1296 $self->update_server_info;
1138 1297
1139 0 1298 0
1140 }); 1299 });
1141 } 1300 }
… …
1143 0 1302 0
1144 }); 1303 });
1145 1304
1146 $self->update_server_info; 1305 $self->update_server_info;
1147 1306
1148 $self->send_command ("output-sync $::CFG->{output_sync}");
1149 $self->send_command ("output-count $::CFG->{output_count}");
1150 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1307 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1151 $self->send_command ("pickup $::CFG->{pickup}"); 1308 $self->send_command ("pickup $::CFG->{pickup}");
1152} 1309}
1153 1310
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 { 1311sub lookat {
1163 my ($self, $x, $y) = @_; 1312 my ($self, $x, $y) = @_;
1164 1313
1165 if ($self->{cfplus_ext}) { 1314 if ($self->{cfplus_ext}) {
1166 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1315 $self->send_ext_req (lookat => $x, $y, sub {
1167 my ($msg) = @_; 1316 my (%msg) = @_;
1168 1317
1169 if (exists $msg->{npc_dialog}) { 1318 if (exists $msg{npc_dialog}) {
1170 # start npc chat dialog 1319 # start npc chat dialog
1171 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1320 $self->{npc_dialog} = new CFPlus::NPCDialog::
1172 dx => $x, 1321 token => $msg{npc_dialog},
1173 dy => $y,
1174 title => "$msg->{npc_dialog} (NPC)", 1322 title => "$msg{npc_dialog}[0] (NPC)",
1175 conn => $self, 1323 conn => $self,
1176 ; 1324 ;
1177 } 1325 }
1178 }); 1326 });
1179 } 1327 }
… …
1244 on_activate => sub { $this->destroy; 1 }, 1392 on_activate => sub { $this->destroy; 1 },
1245 ; 1393 ;
1246 1394
1247 $self->update_options; 1395 $self->update_options;
1248 1396
1249 $self->{id} = $self->{conn}->send_ext_req ( 1397 $self->{id} = "npc-channel-" . $self->{conn}->token;
1250 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1398 $self->{conn}->connect_ext ($self->{id} => sub {
1251 sub { $this && $this->feed (@_) } 1399 $this->feed (@_) if $this;
1252 ); 1400 });
1401
1402 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1253 1403
1254 $self->{entry}->grab_focus; 1404 $self->{entry}->grab_focus;
1255 1405
1256 $self->{textview}->add_paragraph ({ 1406 $self->{textview}->add_paragraph ({
1257 fg => [1, 1, 0, 1], 1407 fg => [1, 1, 0, 1],
… …
1280 ); 1430 );
1281 } 1431 }
1282} 1432}
1283 1433
1284sub feed { 1434sub feed {
1285 my ($self, $msg) = @_; 1435 my ($self, $type, @arg) = @_;
1286 1436
1287 CFPlus::weaken $self; 1437 CFPlus::weaken $self;
1288 1438
1289 if ($msg->{msgtype} eq "reply") { 1439 if ($type eq "update") {
1440 my (%info) = @arg;
1441
1290 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1442 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1291 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1443 $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 1444
1445 if (exists $info{msg}) {
1446 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1447 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1448 my @link;
1449 $text =~ s{
1450 ($match)
1451 }{
1452 my $kw = $1;
1453
1454 push @link, new CFPlus::UI::Label
1455 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1456 can_hover => 1,
1457 can_events => 1,
1458 padding_x => 0,
1459 padding_y => 0,
1460 on_button_up => sub {
1461 $self->send ($kw);
1462 };
1463
1464 "\x{fffc}"
1465 }giex;
1466
1314 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1467 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1315 $self->{textview}->scroll_to_bottom; 1468 $self->{textview}->scroll_to_bottom;
1469 }
1470
1316 $self->update_options; 1471 $self->update_options;
1317 } else { 1472 } else {
1318 $self->destroy; 1473 $self->destroy;
1319 } 1474 }
1320 1475
… …
1325 my ($self, $msg) = @_; 1480 my ($self, $msg) = @_;
1326 1481
1327 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1482 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1328 $self->{textview}->scroll_to_bottom; 1483 $self->{textview}->scroll_to_bottom;
1329 1484
1330 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1485 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1331} 1486}
1332 1487
1333sub destroy { 1488sub destroy {
1334 my ($self) = @_; 1489 my ($self) = @_;
1335 1490
1336 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1491 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1337 1492
1338 if ($self->{conn}) { 1493 if ($self->{conn}) {
1339 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1494 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1340 delete $self->{conn}{npc_dialog}; 1495 delete $self->{conn}{npc_dialog};
1341 $self->{conn}->disconnect_ext ($self->{id}); 1496 $self->{conn}->disconnect_ext ($self->{id});
1342 } 1497 }
1343 1498
1344 $self->SUPER::destroy; 1499 $self->SUPER::destroy;

Diff Legend

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