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.97 by root, Fri Apr 6 08:09:43 2007 UTC vs.
Revision 1.175 by root, Thu Sep 6 15:06:25 2007 UTC

… …
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 'Crossfire::Protocol::Base';
18 16
19sub new { 17sub new {
20 my $class = shift; 18 my ($class, %arg) = @_;
21 19
22 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 20 my $self = $class->SUPER::new (%arg,
21 setup_req => {
22 extmap => 1,
23 excmd => 1,
24 xwidget2 => 1,#d#
25 %{$arg{setup_req} || {}},
26 },
27 );
23 28
24 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
25 30
26 my @cmd_help = map { 31 my @cmd_help = map {
27 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
41 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
42 @args 47 @args
43 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->{par} <=> $b->{par} }
44 CFPlus::Pod::find command => "*"; 49 CFPlus::Pod::find command => "*";
45 50
46 $self->connect_ext (event_capabilities => sub { 51 $self->{json_coder}
52 ->convert_blessed
53 ->filter_json_single_key_object ("\fw" => sub {
54 $self->{widget}{$_[0]}
55 })
56 ->filter_json_single_key_object ("\fc" => sub {
47 my ($cap) = @_; 57 my ($id) = @_;
48 58 sub {
49 if (my $ts = $cap->{tileset}) { 59 $self->send_exti_msg (w_e => $id, @_);
50 if (my ($default) = grep $_->[2] & 1, @$ts) {
51 $self->{tileset} = $default;
52 $self->{tilesize} = $default->[3];
53 $self->setup_req (tileset => $default->[0]);
54
55 my $w = int $self->{mapw} * 32 / $self->{tilesize};
56 my $h = int $self->{maph} * 32 / $self->{tilesize};
57
58 $self->setup_req (mapsize => "${w}x${h}");
59 } 60 }
61 });
62
63 # destroy widgets on logout
64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
65 for my $ws (values %{delete $self->{widgetset} || {}}) {
66 $_->destroy
67 for values %{delete $ws->{w} || {}};
60 } 68 }
61 }); 69 });
62 70
63 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
64 for @cmd_help; 72 for @cmd_help;
… …
81 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
82 90
83 $self 91 $self
84} 92}
85 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
86sub logprint { 296sub logprint {
87 my ($self, @a) = @_; 297 my ($self, @a) = @_;
88 298
89 $self->{log_fh} ||= do { 299 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
90 my $path = "$Crossfire::VARDIR/log.$self->{host}";
91
92 open my $fh, ">>:utf8", $path
93 or die "Couldn't open logfile $path: $!";
94
95 $fh->autoflush (1);
96
97 $fh;
98 };
99
100 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
101
102 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
103 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
104
105 print {$self->{log_fh}} "$ts ", @a, "\n";
106} 300}
107 301
108sub _stat_numdiff { 302sub _stat_numdiff {
109 my ($self, $name, $old, $new) = @_; 303 my ($self, $name, $old, $new) = @_;
110 304
… …
194 388
195 if ( 389 if (
196 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 390 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
197 ) { 391 ) {
198 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 392 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
199 $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);
200 } 394 }
201 395
202 $self->update_stats_window ($stats, $prev); 396 $self->update_stats_window ($stats, $prev);
203 397
204 $self->{prev_stats} = { %$stats }; 398 $self->{prev_stats} = { %$stats };
… …
243 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 437 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
244 $::GAUGES->{food} ->set_value ($fo, $fo_m); 438 $::GAUGES->{food} ->set_value ($fo, $fo_m);
245 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 439 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
246 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 440 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
247 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 441 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
248 my $rng = $stats->{+CS_STAT_RANGE}; 442 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
249 $rng =~ s/^Range: //; # thank you so much dear server 443 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
250 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
251 my $title = $stats->{+CS_STAT_TITLE}; 444 my $title = $stats->{+CS_STAT_TITLE};
252 $title =~ s/^Player: //; 445 $title =~ s/^Player: //;
253 $::STATWIDS->{title} ->set_text ("Title: " . $title); 446 $::STATWIDS->{title} ->set_text ("Title: " . $title);
254 447
255 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 448 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
272 for keys %RES_TBL; 465 for keys %RES_TBL;
273 466
274 my $sktbl = $::STATWIDS->{skill_tbl}; 467 my $sktbl = $::STATWIDS->{skill_tbl};
275 my @skills = keys %{ $self->{skill_info} }; 468 my @skills = keys %{ $self->{skill_info} };
276 469
277 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
278 $sktbl->clear; 478 $sktbl->clear;
279 479
480 my $sw = $self->{skillwid}{""} ||= [
280 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 481 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
281 $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),
282 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 484 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
283 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 485 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
284 $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),
285 $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;
286 492
287 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>";
288 494
289 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);
290 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);
291 497
292 my ($x, $y) = (0, 1); 498 my ($x, $y) = (0, 1);
293 for ( 499 for (@order) {
294 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
295 map [$_, $self->{skill_info}{$_}],
296 grep exists $stats->{$_},
297 @skills
298 ) {
299 my ($idx, $name) = @$_; 500 my ($idx, $name) = @$_;
300 501
301 my $spell_cb = sub { 502 my $spell_cb = sub {
302 my ($widget, $ev) = @_; 503 my ($widget, $ev) = @_;
303 504
… …
318 } 519 }
319 520
320 1 521 1
321 }; 522 };
322 523
323 $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
324 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),
325 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 528
529 # level
530 (new CFPlus::UI::Label
326 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
327 $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,
328 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 ;
329 547
330 $x++ and ($x, $y) = (0, $y + 1); 548 $x++ and ($x, $y) = (0, $y + 1);
331 } 549 }
332 }
333 550
334 for (grep exists $stats->{$_}, @skills) { 551 $sktbl->add_at (@add);
335 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
336 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
337 } 552 }
338}
339 553
340sub macro_send { 554 for (@order) {
341 my ($self, $macro) = @_; 555 my ($idx, $name) = @$_;
556 my $val = $stats->{$idx};
342 557
343 for my $cmd (@{ $macro->{action} }) { 558 next if $prev->{$idx}[1] eq $val->[1];
344 $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);
345 } 567 }
346} 568}
347 569
348sub user_send { 570sub user_send {
349 my ($self, $command) = @_; 571 my ($self, $command) = @_;
… …
351 $self->{record}->($command) 573 $self->{record}->($command)
352 if $self->{record}; 574 if $self->{record};
353 575
354 $self->logprint ("send: ", $command); 576 $self->logprint ("send: ", $command);
355 $self->send_command ($command); 577 $self->send_command ($command);
356 ::status ($command);
357} 578}
358 579
359sub record { 580sub record {
360 my ($self, $cb) = @_; 581 my ($self, $cb) = @_;
361 582
… …
369} 590}
370 591
371sub feed_map1a { 592sub feed_map1a {
372 my ($self, $data) = @_; 593 my ($self, $data) = @_;
373 594
374 $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 Event->timer (after => 0.03, cb => sub {
619 $_[0]->w->cancel;
620 $self->{map_widget}->update
621 if $self->{map_widget};
622 });
623 } else {
375 $self->{map_widget}->update; 624 $self->{map_widget}->update;
625 }
376} 626}
377 627
378sub magicmap { 628sub magicmap {
379 my ($self, $w, $h, $x, $y, $data) = @_; 629 my ($self, $w, $h, $x, $y, $data) = @_;
380 630
… …
387 my $map_info = delete $self->{map_info} 637 my $map_info = delete $self->{map_info}
388 or return; 638 or return;
389 639
390 my ($hash, $x, $y, $w, $h) = @$map_info; 640 my ($hash, $x, $y, $w, $h) = @$map_info;
391 641
392 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 642 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
643 $self->{map_cache_new}{$hash} = \$data;
393 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 644 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
394 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
395} 645}
396 646
397sub map_clear { 647sub map_clear {
398 my ($self) = @_; 648 my ($self) = @_;
399 649
… …
405} 655}
406 656
407sub bg_fetch { 657sub bg_fetch {
408 my ($self) = @_; 658 my ($self) = @_;
409 659
410 my $id; 660 my $tile;
411 661
412 do { 662 do {
413 $id = pop @{$self->{bg_fetch}} 663 $tile = pop @{$self->{bg_fetch}}
414 or return; 664 or return;
415 } while $self->{texture}[$id]; 665 } while $self->{texture}[$tile];
416 666
417 CFPlus::DB::get tilecache => $id, sub { 667 CFPlus::DB::get tilecache => $tile, sub {
418 my ($data) = @_; 668 my ($data) = @_;
419 669
420 $self->set_texture ($id => $data) 670 return unless $self->{map}; # stop when destroyed
671
421 if defined $data; 672 if (defined $data) {
673 $self->have_tile ($tile, $data);
674 $self->{texture}[$tile]->upload;
675 }
422 676
423 $self->bg_fetch; 677 $self->bg_fetch;
424 }; 678 };
425} 679}
426 680
427sub load_map($$$) { 681sub load_map($$$) {
428 my ($self, $hash, $x, $y) = @_; 682 my ($self, $hash, $x, $y) = @_;
429 683
430 CFPlus::DB::get $self->{mapcache} => $hash, sub { 684 my $gen = $self->{map_change_gen};
685
686 my $cb = sub {
687 return unless $gen == $self->{map_change_gen};
688
431 my ($data) = @_; 689 my ($data) = @_;
432 690
433 if (defined $data) { 691 if (defined $data) {
692 $self->{map_cache_new}{$hash} = \$data;
693
434 $data = Compress::LZF::decompress $data; 694 my $data = Compress::LZF::decompress $data;
435 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
436 695
437 my $inprogress = @{ $self->{bg_fetch} || [] }; 696 my $inprogress = @{ $self->{bg_fetch} || [] };
438 push @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 697 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
439 $self->bg_fetch unless $inprogress; 698 $self->bg_fetch unless $inprogress;
440 } 699 }
441 }; 700 };
701
702 if (my $rdata = $self->{map_cache_old}{$hash}) {
703 $cb->($$rdata);
704 } else {
705 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
706 }
442} 707}
443 708
444# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 709# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
445# (server resource,s latency, bandwidth), so this hack is warranted. 710# (server resource,s latency, bandwidth), so this hack is warranted.
446# the right fix is to make real tiled maps with an overview file 711# the right fix is to make real tiled maps with an overview file
… …
510 775
511 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 776 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
512 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 777 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
513 778
514 } else { 779 } else {
780 my $gen = $self->{map_change_gen};
515 $self->send_mapinfo ("spatial $path$tile", sub { 781 $self->send_mapinfo ("spatial $path$tile", sub {
782 return unless $gen == $self->{map_change_gen};
783
516 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 784 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
517 785
518 return if $mode ne "spatial"; 786 return if $mode ne "spatial";
519 787
520 $x += $self->{map}->ox; 788 $x += $self->{map}->ox;
… …
534 802
535sub map_change { 803sub map_change {
536 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 804 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
537 805
538 $self->flush_map; 806 $self->flush_map;
807
808 ++$self->{map_change_gen};
809 $self->{map_cache_old} = delete $self->{map_cache_new};
539 810
540 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 811 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
541 812
542 my $mapmapw = $self->{mapmap}->{w}; 813 my $mapmapw = $self->{mapmap}->{w};
543 my $mapmaph = $self->{mapmap}->{h}; 814 my $mapmaph = $self->{mapmap}->{h};
… …
562} 833}
563 834
564sub face_find { 835sub face_find {
565 my ($self, $facenum, $face, $cb) = @_; 836 my ($self, $facenum, $face, $cb) = @_;
566 837
567 my $hash = "$face->{chksum},$face->{name}"; 838 if ($face->{type} == 0) { # FT_FACE
568
569 my $id = CFPlus::DB::get_tile_id_sync $hash; 839 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
570 840
571 $face->{id} = $id; 841 $face->{id} = $id;
572 $self->{faceid}[$facenum] = $id;
573
574 $self->{map}->set_tileid ($facenum => $id); 842 $self->{map}->set_tileid ($facenum => $id);
575 843
576 CFPlus::DB::get tilecache => $id, $cb; 844 CFPlus::DB::get tilecache => $id, $cb;
845
846 } elsif ($face->{type} & 1) { # with metadata
847 CFPlus::DB::get res_meta => $face->{name}, $cb;
848
849 } else { # no metadata
850 CFPlus::DB::get res_data => $face->{name}, $cb;
851 }
577} 852}
578 853
579sub face_update { 854sub face_update {
580 my ($self, $facenum, $face, $changed) = @_; 855 my ($self, $facenum, $face, $changed) = @_;
581 856
857 if ($face->{type} == 0) {
858 # image, FT_FACE
582 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 859 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
583 if $changed; 860 if $changed;
584 861
585 $self->set_texture ($face->{id} => delete $face->{image}); 862 $self->have_tile ($face->{id}, delete $face->{data});
586}
587 863
588sub set_texture { 864 } elsif ($face->{type} & 1) {
865 # split metadata case, FT_MUSIC, FT_SOUND
866 if ($changed) { # new data
867 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
868 $face->{data} = $meta;
869
870 # rely on strict ordering here and also on later fetch
871 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
872 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
873 }
874
875 $face->{data} = $self->{json_coder}->decode ($face->{data});
876 ::add_license ($face);
877 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
878 if $changed;
879
880 if ($face->{type} == 3) { # FT_MUSIC
881 &::audio_music_push ($facenum);
882 } elsif ($face->{type} == 5) { # FT_SOUND
883 &::audio_sound_push ($facenum);
884 }
885
886 } else {
887 # flat resource case, FT_RSRC
888 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
889 if $changed;
890 }
891
892 if (my $cbs = $self->{face_cb}{$facenum}) {
893 $_->($face, $changed) for @$cbs;
894 }
895}
896
897sub smooth_update {
898 my ($self, $facenum, $face) = @_;
899
900 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
901}
902
903sub have_tile {
589 my ($self, $id, $data) = @_; 904 my ($self, $tile, $data) = @_;
590 905
591 $self->{texture}[$id] ||= do { 906 return unless $self->{map};
592 my $tex = 907
908 my $tex = $self->{texture}[$tile] ||=
593 new_from_image CFPlus::Texture 909 new CFPlus::Texture
910 tile => $tile,
911 image => $data, delete_image => 1,
594 $data, minify => 1, mipmap => 1; 912 minify => 1, mipmap => 1;
595 913
596 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 914 if (my $cbs = delete $self->{tile_cb}{$tile}) {
597 $self->{map_widget}->update; 915 $_->($tex) for @$cbs;
598
599 $tex
600 }; 916 }
917}
918
919# call in non-void context registers a temporary
920# hook with handle, otherwise its permanent
921sub on_face_change {
922 my ($self, $num, $cb) = @_;
923
924 push @{$self->{face_cb}{$num}}, $cb;
925
926 defined wantarray
927 ? CFPlus::guard {
928 @{$self->{face_cb}{$num}}
929 = grep $_ != $cb,
930 @{$self->{face_cb}{$num}};
931 }
932 : ()
933}
934
935# call in non-void context registers a temporary
936# hook with handle, otherwise its permanent
937sub register_face_handler {
938 my ($self, $num, $cb) = @_;
939
940 return unless $num;
941
942 # invoke if available right now
943 $cb->($self->{face}[$num], 0)
944 unless exists $self->{face}[$num]{loading};
945
946 # future changes
947 $self->on_face_change ($num => $cb)
601} 948}
602 949
603sub sound_play { 950sub sound_play {
604 my ($self, $x, $y, $soundnum, $type) = @_; 951 my ($self, $type, $face, $dx, $dy, $vol) = @_;
605 952
606 $self->{sound_play}->($x, $y, $soundnum, $type); 953 &::audio_sound_play ($face, $dx, $dy, $vol)
954 unless $type & 1; # odd types are silent for future expansion
607} 955}
608 956
609my $LAST_QUERY; # server is stupid, stupid, stupid 957my $LAST_QUERY; # server is stupid, stupid, stupid
610 958
611sub query { 959sub query {
… …
615 $LAST_QUERY = $prompt; 963 $LAST_QUERY = $prompt;
616 964
617 $self->{query}-> ($self, $flags, $prompt); 965 $self->{query}-> ($self, $flags, $prompt);
618} 966}
619 967
620sub drawinfo { 968sub sanitise_xml($) {
621 my ($self, $color, $text) = @_; 969 local $_ = shift;
622 970
623 my @color = ( 971 # we now weed out all tags we do not support
972 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
973 }{
974 "&lt;"
975 }gex;
976
977 # now all entities
978 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
979
980 # handle some elements
981 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
982 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
983
984 $_
985}
986
987our %NAME_TO_COLOR = (
988 black => 0,
989 white => 1,
990 darkblue => 2,
991 red => 3,
992 orange => 4,
993 lightblue => 5,
994 darkorange => 6,
995 green => 7,
996 darkgreen => 8,
997 grey => 9,
998 brown => 10,
999 yellow => 11,
1000 tan => 12,
1001);
1002
1003our @CF_COLOR = (
624 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1004 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
625 [1.00, 1.00, 1.00], 1005 [1.00, 1.00, 1.00],
626 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1006 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
627 [1.00, 0.00, 0.00], 1007 [1.00, 0.00, 0.00],
628 [1.00, 0.54, 0.00], 1008 [1.00, 0.54, 0.00],
629 [0.11, 0.56, 1.00], 1009 [0.11, 0.56, 1.00],
630 [0.93, 0.46, 0.00], 1010 [0.93, 0.46, 0.00],
631 [0.18, 0.54, 0.34], 1011 [0.18, 0.54, 0.34],
632 [0.56, 0.73, 0.56], 1012 [0.56, 0.73, 0.56],
633 [0.80, 0.80, 0.80], 1013 [0.80, 0.80, 0.80],
634 [0.75, 0.61, 0.20], 1014 [0.75, 0.61, 0.20],
635 [0.99, 0.77, 0.26], 1015 [0.99, 0.77, 0.26],
636 [0.74, 0.65, 0.41], 1016 [0.74, 0.65, 0.41],
637 ); 1017);
638 1018
639 my $fg = $color[$color % @color]; 1019sub msg {
1020 my ($self, $color, $type, $text, @extra) = @_;
640 1021
1022 $text = sanitise_xml $text;
1023
1024 if (my $cb = $self->{cb_msg}{$type}) {
1025 $_->($self, $color, $type, $text, @extra) for values %$cb;
1026 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1027 $type =~ s/-/_/g;
1028 $self->{$type} = $text;
1029 } else {
641 $self->logprint ("info: ", $text); 1030 $self->logprint ("msg: ", $text);
1031 return if $color < 0; # negative color == ignore if not understood
642 1032
1033 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1034
643 # try to create single paragraphs of multiple lines sent by the server 1035 ## try to create single paragraphs of multiple lines sent by the server
1036 # no longer neecssary with TRT servers
644 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1037 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
645 1038
646 $text = CFPlus::asxml $text;
647 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
648 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
649
650 ::message ({ fg => $fg, markup => $_ })
651 for split /\n/, $text; 1039 for (split /\n/, $text) {
1040 ::message ({
1041 fg => $fg,
1042 markup => $_,
1043 type => $type,
1044 extra => [@extra],
1045 color_flags => $color, #d# ugly, kill
1046 });
652 1047
1048 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1049 # actually, this is an ugly design. _we_ should control the channels,
1050 # not some random other widget, as the channels are clearly protocol-specific.
1051 # then we could also react to flags such as CLEAR without resorting to
1052 # hacks such as color_flags, above.
1053 }
1054
653 $self->{statusbox}->add ($text, 1055 $self->{statusbox}->add ($text,
654 group => $text, 1056 group => $text,
655 fg => $fg, 1057 fg => $fg,
656 timeout => $color >= 2 ? 180 : 10, 1058 timeout => $color >= 2 ? 180 : 10,
657 tooltip_font => $::FONT_FIXED, 1059 tooltip_font => $::FONT_FIXED,
658 ); 1060 ) if $type eq "info";
659} 1061 }
660
661sub drawextinfo {
662 my ($self, $color, $type, $subtype, $message) = @_;
663
664 $self->drawinfo ($color, $message);
665} 1062}
666 1063
667sub spell_add { 1064sub spell_add {
668 my ($self, $spell) = @_; 1065 my ($self, $spell) = @_;
669 1066
… …
717 $self->{map_widget}->clr_commands; 1114 $self->{map_widget}->clr_commands;
718 1115
719 ::stop_game (); 1116 ::stop_game ();
720} 1117}
721 1118
722sub image_info {
723 my ($self, $numfaces) = @_;
724
725 $self->{num_faces} = $numfaces;
726 $self->{face_prefetch} = [1 .. $numfaces];
727 $self->face_prefetch;
728}
729
730sub face_prefetch {
731 my ($self) = @_;
732
733 return unless $::CFG->{face_prefetch};
734
735 if ($self->{num_faces}) {
736 return if @{ $self->{send_queue} || [] };
737 my $todo = @{ $self->{face_prefetch} }
738 or return;
739
740 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
741
742 $self->send ("requestinfo image_sums $face $face");
743
744 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
745 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
746 } elsif (!exists $self->{num_faces}) {
747 $self->send ("requestinfo image_info");
748
749 $self->{num_faces} = 0;
750
751 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
752 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
753 }
754}
755
756sub update_floorbox { 1119sub update_floorbox {
757 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1120 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
758 return unless $::CONN; 1121 return unless $::CONN;
759 1122
760 $::FLOORBOX->clear; 1123 $::FLOORBOX->clear;
1124
1125 my @add;
761 1126
762 my $row; 1127 my $row;
763 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1128 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
764 if ($row < 6) { 1129 if ($row < 6) {
765 local $_->{face_widget}; # hack to force recreation of widget 1130 local $_->{face_widget}; # hack to force recreation of widget
766 local $_->{desc_widget}; # hack to force recreation of widget 1131 local $_->{desc_widget}; # hack to force recreation of widget
767 CFPlus::Item::update_widgets $_; 1132 CFPlus::Item::update_widgets $_;
768 1133
1134 push @add,
769 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1135 0, $row, $_->{face_widget},
770 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1136 1, $row, $_->{desc_widget};
771 1137
772 $row++; 1138 $row++;
773 } else { 1139 } else {
774 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1140 push @add, 1, $row, new CFPlus::UI::Button
775 text => "More...", 1141 text => "More...",
776 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1142 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
777 ); 1143 ;
778 last; 1144 last;
779 } 1145 }
780 } 1146 }
781 if ($::CONN->{open_container}) { 1147 if ($::CONN->{open_container}) {
782 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1148 push @add, 1, $row++, new CFPlus::UI::Button
783 text => "Close container", 1149 text => "Close container",
784 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1150 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
785 ); 1151 ;
786 } 1152 }
1153
1154 $::FLOORBOX->add_at (@add);
787 }); 1155 });
788 1156
789 $::WANT_REFRESH++; 1157 $::WANT_REFRESH->start;
790} 1158}
791 1159
792sub set_opencont { 1160sub set_opencont {
793 my ($conn, $tag, $name) = @_; 1161 my ($conn, $tag, $name) = @_;
794 $conn->{open_container} = $tag; 1162 $conn->{open_container} = $tag;
795 update_floorbox; 1163 update_floorbox;
796 1164
797 $::INV_RIGHT_HB->clear (); 1165 $::INVR_HB->clear ();
798 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1166 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
799 1167
800 if ($tag != 0) { # Floor isn't closable, is it? 1168 if ($tag != 0) { # Floor isn't closable, is it?
801 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1169 $::INVR_HB->add (new CFPlus::UI::Button
802 text => "Close container", 1170 text => "Close container",
803 tooltip => "Close the currently open container (if one is open)", 1171 tooltip => "Close the currently open container (if one is open)",
804 on_activate => sub { 1172 on_activate => sub {
805 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1173 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
806 if $tag != 0; 1174 if $tag != 0;
807 #if $CONN->{open_container} != 0;
808 0 1175 0
809 }, 1176 },
810 ); 1177 );
811 } 1178 }
812 1179
… …
902 $::SERVER_INFO->set_markup ( 1269 $::SERVER_INFO->set_markup (
903 "server <tt>$self->{host}:$self->{port}</tt>\n" 1270 "server <tt>$self->{host}:$self->{port}</tt>\n"
904 . "protocol version <tt>$self->{version}</tt>\n" 1271 . "protocol version <tt>$self->{version}</tt>\n"
905 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1272 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
906 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1273 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1274 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
907 . "editing support $yesno[!!$self->{editor_support}]\n" 1275 . "editing support $yesno[!!$self->{editor_support}]\n"
908 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1276 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1277 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
909 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1278 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
910 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1279 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
911 . "map size $self->{mapw}×$self->{maph}\n" 1280 . "map size $self->{mapw}×$self->{maph}\n"
912 ); 1281 );
913 1282
914 ::setup_build_button ($self->{editor_support}->{builder_ui});
915} 1283}
916 1284
917sub logged_in { 1285sub logged_in {
918 my ($self) = @_; 1286 my ($self) = @_;
919 1287
920 $self->send_ext_req (cfplus_support => version => 1, sub { 1288 $self->send_ext_req (cfplus_support => version => 2, sub {
1289 my (%msg) = @_;
1290
921 $self->{cfplus_ext} = $_[0]{version}; 1291 $self->{cfplus_ext} = $msg{version};
922 $self->update_server_info; 1292 $self->update_server_info;
923 1293
924 if ($self->{cfplus_ext} >= 2) { 1294 if ($self->{cfplus_ext} >= 2) {
925 $self->send_ext_req ("editor_support", sub { 1295 $self->send_ext_req ("editor_support", sub {
926 $self->{editor_support} = $_[0]; 1296 $self->{editor_support} = { @_ };
927 $self->update_server_info; 1297 $self->update_server_info;
928 1298
929 0 1299 0
930 }); 1300 });
931 } 1301 }
… …
939 $self->send_command ("output-count $::CFG->{output_count}"); 1309 $self->send_command ("output-count $::CFG->{output_count}");
940 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1310 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
941 $self->send_command ("pickup $::CFG->{pickup}"); 1311 $self->send_command ("pickup $::CFG->{pickup}");
942} 1312}
943 1313
944sub buildat {
945 my ($self, $builditem, $x, $y) = @_;
946
947 if ($self->{cfplus_ext}) {
948 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
949 }
950}
951
952sub lookat { 1314sub lookat {
953 my ($self, $x, $y) = @_; 1315 my ($self, $x, $y) = @_;
954 1316
955 if ($self->{cfplus_ext}) { 1317 if ($self->{cfplus_ext}) {
956 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1318 $self->send_ext_req (lookat => $x, $y, sub {
957 my ($msg) = @_; 1319 my (%msg) = @_;
958 1320
959 if (exists $msg->{npc_dialog}) { 1321 if (exists $msg{npc_dialog}) {
960 # start npc chat dialog 1322 # start npc chat dialog
961 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1323 $self->{npc_dialog} = new CFPlus::NPCDialog::
962 dx => $x, 1324 token => $msg{npc_dialog},
963 dy => $y,
964 title => "$msg->{npc_dialog} (NPC)", 1325 title => "$msg{npc_dialog}[0] (NPC)",
965 conn => $self, 1326 conn => $self,
966 ; 1327 ;
967 } 1328 }
968 }); 1329 });
969 } 1330 }
… …
976 1337
977 (delete $self->{npc_dialog})->destroy 1338 (delete $self->{npc_dialog})->destroy
978 if $self->{npc_dialog}; 1339 if $self->{npc_dialog};
979 1340
980 $self->SUPER::destroy; 1341 $self->SUPER::destroy;
1342
1343 %$self = ();
981} 1344}
982 1345
983package CFPlus::NPCDialog; 1346package CFPlus::NPCDialog;
984 1347
985our @ISA = 'CFPlus::UI::Toplevel'; 1348our @ISA = 'CFPlus::UI::Toplevel';
… …
1032 on_activate => sub { $this->destroy; 1 }, 1395 on_activate => sub { $this->destroy; 1 },
1033 ; 1396 ;
1034 1397
1035 $self->update_options; 1398 $self->update_options;
1036 1399
1037 $self->{id} = $self->{conn}->send_ext_req ( 1400 $self->{id} = "npc-channel-" . $self->{conn}->token;
1038 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1401 $self->{conn}->connect_ext ($self->{id} => sub {
1039 sub { $this && $this->feed (@_) } 1402 $this->feed (@_) if $this;
1040 ); 1403 });
1404
1405 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1041 1406
1042 $self->{entry}->grab_focus; 1407 $self->{entry}->grab_focus;
1043 1408
1044 $self->{textview}->add_paragraph ({ 1409 $self->{textview}->add_paragraph ({
1045 fg => [1, 1, 0, 1], 1410 fg => [1, 1, 0, 1],
… …
1068 ); 1433 );
1069 } 1434 }
1070} 1435}
1071 1436
1072sub feed { 1437sub feed {
1073 my ($self, $msg) = @_; 1438 my ($self, $type, @arg) = @_;
1074 1439
1075 CFPlus::weaken $self; 1440 CFPlus::weaken $self;
1076 1441
1077 if ($msg->{msgtype} eq "reply") { 1442 if ($type eq "update") {
1443 my (%info) = @arg;
1444
1078 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1445 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1079 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1446 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1080
1081 my $text = "\n" . CFPlus::asxml $msg->{msg};
1082 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1083 my @link;
1084 $text =~ s{
1085 ($match)
1086 }{
1087 my $kw = $1;
1088
1089 push @link, new CFPlus::UI::Label
1090 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1091 can_hover => 1,
1092 can_events => 1,
1093 padding_x => 0,
1094 padding_y => 0,
1095 on_button_up => sub {
1096 $self->send ($kw);
1097 };
1098
1099 "\x{fffc}"
1100 }giex;
1101 1447
1448 if (exists $info{msg}) {
1449 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1450 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1451 my @link;
1452 $text =~ s{
1453 ($match)
1454 }{
1455 my $kw = $1;
1456
1457 push @link, new CFPlus::UI::Label
1458 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1459 can_hover => 1,
1460 can_events => 1,
1461 padding_x => 0,
1462 padding_y => 0,
1463 on_button_up => sub {
1464 $self->send ($kw);
1465 };
1466
1467 "\x{fffc}"
1468 }giex;
1469
1102 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1470 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1103 $self->{textview}->scroll_to_bottom; 1471 $self->{textview}->scroll_to_bottom;
1472 }
1473
1104 $self->update_options; 1474 $self->update_options;
1105 } else { 1475 } else {
1106 $self->destroy; 1476 $self->destroy;
1107 } 1477 }
1108 1478
… …
1113 my ($self, $msg) = @_; 1483 my ($self, $msg) = @_;
1114 1484
1115 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1485 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1116 $self->{textview}->scroll_to_bottom; 1486 $self->{textview}->scroll_to_bottom;
1117 1487
1118 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1488 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1119} 1489}
1120 1490
1121sub destroy { 1491sub destroy {
1122 my ($self) = @_; 1492 my ($self) = @_;
1123 1493
1124 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1494 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1125 1495
1126 if ($self->{conn}) { 1496 if ($self->{conn}) {
1127 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1497 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1128 delete $self->{conn}{npc_dialog}; 1498 delete $self->{conn}{npc_dialog};
1129 $self->{conn}->disconnect_ext ($self->{id}); 1499 $self->{conn}->disconnect_ext ($self->{id});
1130 } 1500 }
1131 1501
1132 $self->SUPER::destroy; 1502 $self->SUPER::destroy;

Diff Legend

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