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.99 by root, Tue Apr 10 09:39:48 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 = shift; 18 my ($class, %arg) = @_;
21 19
22 my $self = $class->SUPER::new (@_, 20 my $self = $class->SUPER::new (%arg,
23 setup_req => { 21 setup_req => {
24 extmap => 1, 22 extmap => 1,
25 smoothing => 1, 23 excmd => 1,
24 widget => 1,
25 %{$arg{setup_req} || {}},
26 }, 26 },
27 ); 27 );
28 28
29 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
30 30
… …
46 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
47 @args 47 @args
48 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->{par} <=> $b->{par} }
49 CFPlus::Pod::find command => "*"; 49 CFPlus::Pod::find command => "*";
50 50
51 $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 {
52 my ($cap) = @_; 57 my ($id) = @_;
53 58 sub {
54 if (my $ts = $cap->{tileset}) { 59 $self->send_exti_msg (w_e => $id, @_);
55 if (my ($default) = grep $_->[2] & 1, @$ts) {
56 $self->{tileset} = $default;
57 $self->{tilesize} = $default->[3];
58 $self->setup_req (tileset => $default->[0]);
59
60 my $w = int $self->{mapw} * 32 / $self->{tilesize};
61 my $h = int $self->{maph} * 32 / $self->{tilesize};
62
63 $self->setup_req (mapsize => "${w}x${h}");
64 } 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} || {}};
65 } 68 }
66 }); 69 });
67 70
68 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
69 for @cmd_help; 72 for @cmd_help;
… …
86 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
87 90
88 $self 91 $self
89} 92}
90 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
91sub logprint { 296sub logprint {
92 my ($self, @a) = @_; 297 my ($self, @a) = @_;
93 298
94 $self->{log_fh} ||= do { 299 CFPlus::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
95 my $path = "$Crossfire::VARDIR/log.$self->{host}";
96
97 open my $fh, ">>:utf8", $path
98 or die "Couldn't open logfile $path: $!";
99
100 $fh->autoflush (1);
101
102 $fh;
103 };
104
105 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
106
107 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
108 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
109
110 print {$self->{log_fh}} "$ts ", @a, "\n";
111} 300}
112 301
113sub _stat_numdiff { 302sub _stat_numdiff {
114 my ($self, $name, $old, $new) = @_; 303 my ($self, $name, $old, $new) = @_;
115 304
… …
199 388
200 if ( 389 if (
201 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 390 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
202 ) { 391 ) {
203 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 392 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
204 $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);
205 } 394 }
206 395
207 $self->update_stats_window ($stats, $prev); 396 $self->update_stats_window ($stats, $prev);
208 397
209 $self->{prev_stats} = { %$stats }; 398 $self->{prev_stats} = { %$stats };
… …
248 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 437 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
249 $::GAUGES->{food} ->set_value ($fo, $fo_m); 438 $::GAUGES->{food} ->set_value ($fo, $fo_m);
250 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 439 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
251 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 440 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
252 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 441 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
253 my $rng = $stats->{+CS_STAT_RANGE}; 442 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
254 $rng =~ s/^Range: //; # thank you so much dear server 443 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
255 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
256 my $title = $stats->{+CS_STAT_TITLE}; 444 my $title = $stats->{+CS_STAT_TITLE};
257 $title =~ s/^Player: //; 445 $title =~ s/^Player: //;
258 $::STATWIDS->{title} ->set_text ("Title: " . $title); 446 $::STATWIDS->{title} ->set_text ("Title: " . $title);
259 447
260 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 448 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
277 for keys %RES_TBL; 465 for keys %RES_TBL;
278 466
279 my $sktbl = $::STATWIDS->{skill_tbl}; 467 my $sktbl = $::STATWIDS->{skill_tbl};
280 my @skills = keys %{ $self->{skill_info} }; 468 my @skills = keys %{ $self->{skill_info} };
281 469
282 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
283 $sktbl->clear; 478 $sktbl->clear;
284 479
480 my $sw = $self->{skillwid}{""} ||= [
285 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 481 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
286 $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),
287 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 484 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
288 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 485 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
289 $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),
290 $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;
291 492
292 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>";
293 494
294 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);
295 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);
296 497
297 my ($x, $y) = (0, 1); 498 my ($x, $y) = (0, 1);
298 for ( 499 for (@order) {
299 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
300 map [$_, $self->{skill_info}{$_}],
301 grep exists $stats->{$_},
302 @skills
303 ) {
304 my ($idx, $name) = @$_; 500 my ($idx, $name) = @$_;
305 501
306 my $spell_cb = sub { 502 my $spell_cb = sub {
307 my ($widget, $ev) = @_; 503 my ($widget, $ev) = @_;
308 504
… …
323 } 519 }
324 520
325 1 521 1
326 }; 522 };
327 523
328 $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
329 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),
330 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 528
529 # level
530 (new CFPlus::UI::Label
331 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
332 $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,
333 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 ;
334 547
335 $x++ and ($x, $y) = (0, $y + 1); 548 $x++ and ($x, $y) = (0, $y + 1);
336 } 549 }
337 }
338 550
339 for (grep exists $stats->{$_}, @skills) { 551 $sktbl->add_at (@add);
340 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
341 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
342 } 552 }
343}
344 553
345sub macro_send { 554 for (@order) {
346 my ($self, $macro) = @_; 555 my ($idx, $name) = @$_;
556 my $val = $stats->{$idx};
347 557
348 for my $cmd (@{ $macro->{action} }) { 558 next if $prev->{$idx}[1] eq $val->[1];
349 $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);
350 } 567 }
351} 568}
352 569
353sub user_send { 570sub user_send {
354 my ($self, $command) = @_; 571 my ($self, $command) = @_;
… …
356 $self->{record}->($command) 573 $self->{record}->($command)
357 if $self->{record}; 574 if $self->{record};
358 575
359 $self->logprint ("send: ", $command); 576 $self->logprint ("send: ", $command);
360 $self->send_command ($command); 577 $self->send_command ($command);
361 ::status ($command);
362} 578}
363 579
364sub record { 580sub record {
365 my ($self, $cb) = @_; 581 my ($self, $cb) = @_;
366 582
… …
374} 590}
375 591
376sub feed_map1a { 592sub feed_map1a {
377 my ($self, $data) = @_; 593 my ($self, $data) = @_;
378 594
379 $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 {
380 $self->{map_widget}->update; 623 $self->{map_widget}->update;
624 }
381} 625}
382 626
383sub magicmap { 627sub magicmap {
384 my ($self, $w, $h, $x, $y, $data) = @_; 628 my ($self, $w, $h, $x, $y, $data) = @_;
385 629
… …
392 my $map_info = delete $self->{map_info} 636 my $map_info = delete $self->{map_info}
393 or return; 637 or return;
394 638
395 my ($hash, $x, $y, $w, $h) = @$map_info; 639 my ($hash, $x, $y, $w, $h) = @$map_info;
396 640
397 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;
398 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 643 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
399 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
400} 644}
401 645
402sub map_clear { 646sub map_clear {
403 my ($self) = @_; 647 my ($self) = @_;
404 648
… …
410} 654}
411 655
412sub bg_fetch { 656sub bg_fetch {
413 my ($self) = @_; 657 my ($self) = @_;
414 658
415 my $id; 659 my $tile;
416 660
417 do { 661 do {
418 $id = pop @{$self->{bg_fetch}} 662 $tile = pop @{$self->{bg_fetch}}
419 or return; 663 or return;
420 } while $self->{texture}[$id]; 664 } while $self->{texture}[$tile];
421 665
422 CFPlus::DB::get tilecache => $id, sub { 666 CFPlus::DB::get tilecache => $tile, sub {
423 my ($data) = @_; 667 my ($data) = @_;
424 668
425 return unless $self->{map}; # stop when destroyed 669 return unless $self->{map}; # stop when destroyed
426 670
427 $self->set_texture ($id => $data)
428 if defined $data; 671 if (defined $data) {
672 $self->have_tile ($tile, $data);
673 $self->{texture}[$tile]->upload;
674 }
429 675
430 $self->bg_fetch; 676 $self->bg_fetch;
431 }; 677 };
432} 678}
433 679
434sub load_map($$$) { 680sub load_map($$$) {
435 my ($self, $hash, $x, $y) = @_; 681 my ($self, $hash, $x, $y) = @_;
436 682
437 CFPlus::DB::get $self->{mapcache} => $hash, sub { 683 my $gen = $self->{map_change_gen};
684
685 my $cb = sub {
686 return unless $gen == $self->{map_change_gen};
687
438 my ($data) = @_; 688 my ($data) = @_;
439 689
440 if (defined $data) { 690 if (defined $data) {
691 $self->{map_cache_new}{$hash} = \$data;
692
441 $data = Compress::LZF::decompress $data; 693 my $data = Compress::LZF::decompress $data;
442 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
443 694
444 my $inprogress = @{ $self->{bg_fetch} || [] }; 695 my $inprogress = @{ $self->{bg_fetch} || [] };
445 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 696 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
446 $self->bg_fetch unless $inprogress; 697 $self->bg_fetch unless $inprogress;
447 } 698 }
448 }; 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 }
449} 706}
450 707
451# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 708# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
452# (server resource,s latency, bandwidth), so this hack is warranted. 709# (server resource,s latency, bandwidth), so this hack is warranted.
453# 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
… …
517 774
518 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 775 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
519 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 776 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
520 777
521 } else { 778 } else {
779 my $gen = $self->{map_change_gen};
522 $self->send_mapinfo ("spatial $path$tile", sub { 780 $self->send_mapinfo ("spatial $path$tile", sub {
781 return unless $gen == $self->{map_change_gen};
782
523 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 783 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
524 784
525 return if $mode ne "spatial"; 785 return if $mode ne "spatial";
526 786
527 $x += $self->{map}->ox; 787 $x += $self->{map}->ox;
… …
541 801
542sub map_change { 802sub map_change {
543 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 803 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
544 804
545 $self->flush_map; 805 $self->flush_map;
806
807 ++$self->{map_change_gen};
808 $self->{map_cache_old} = delete $self->{map_cache_new};
546 809
547 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 810 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
548 811
549 my $mapmapw = $self->{mapmap}->{w}; 812 my $mapmapw = $self->{mapmap}->{w};
550 my $mapmaph = $self->{mapmap}->{h}; 813 my $mapmaph = $self->{mapmap}->{h};
… …
569} 832}
570 833
571sub face_find { 834sub face_find {
572 my ($self, $facenum, $face, $cb) = @_; 835 my ($self, $facenum, $face, $cb) = @_;
573 836
574 my $hash = "$face->{chksum},$face->{name}"; 837 if ($face->{type} == 0) { # FT_FACE
575
576 my $id = CFPlus::DB::get_tile_id_sync $hash; 838 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
577 839
578 $face->{id} = $id; 840 $face->{id} = $id;
579 $self->{faceid}[$facenum] = $id;
580
581 $self->{map}->set_tileid ($facenum => $id); 841 $self->{map}->set_tileid ($facenum => $id);
582 842
583 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 }
584} 851}
585 852
586sub face_update { 853sub face_update {
587 my ($self, $facenum, $face, $changed) = @_; 854 my ($self, $facenum, $face, $changed) = @_;
588 855
856 if ($face->{type} == 0) {
857 # image, FT_FACE
589 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 858 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
590 if $changed; 859 if $changed;
591 860
592 $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 }
593} 894}
594 895
595sub smooth_update { 896sub smooth_update {
596 my ($self, $facenum, $face) = @_; 897 my ($self, $facenum, $face) = @_;
597 898
598 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 899 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
599} 900}
600 901
601sub set_texture { 902sub have_tile {
602 my ($self, $id, $data) = @_; 903 my ($self, $tile, $data) = @_;
603 904
604 $self->{texture}[$id] = my $tex = 905 return unless $self->{map};
906
907 my $tex = $self->{texture}[$tile] ||=
605 new_from_image CFPlus::Texture 908 new CFPlus::Texture
909 tile => $tile,
910 image => $data, delete_image => 1,
606 $data, minify => 1, mipmap => 1; 911 minify => 1, mipmap => 1;
607 912
608 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 913 if (my $cbs = delete $self->{tile_cb}{$tile}) {
609 $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)
610} 947}
611 948
612sub sound_play { 949sub sound_play {
613 my ($self, $x, $y, $soundnum, $type) = @_; 950 my ($self, $type, $face, $dx, $dy, $vol) = @_;
614 951
615 $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
616} 954}
617 955
618my $LAST_QUERY; # server is stupid, stupid, stupid 956my $LAST_QUERY; # server is stupid, stupid, stupid
619 957
620sub query { 958sub query {
… …
624 $LAST_QUERY = $prompt; 962 $LAST_QUERY = $prompt;
625 963
626 $self->{query}-> ($self, $flags, $prompt); 964 $self->{query}-> ($self, $flags, $prompt);
627} 965}
628 966
629sub drawinfo { 967sub sanitise_xml($) {
630 my ($self, $color, $text) = @_; 968 local $_ = shift;
631 969
632 my @color = ( 970 # we now weed out all tags we do not support
971 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
972 }{
973 "&lt;"
974 }gex;
975
976 # now all entities
977 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
978
979 # handle some elements
980 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
981 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
982
983 $_
984}
985
986our %NAME_TO_COLOR = (
987 black => 0,
988 white => 1,
989 darkblue => 2,
990 red => 3,
991 orange => 4,
992 lightblue => 5,
993 darkorange => 6,
994 green => 7,
995 darkgreen => 8,
996 grey => 9,
997 brown => 10,
998 yellow => 11,
999 tan => 12,
1000);
1001
1002our @CF_COLOR = (
633 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1003 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
634 [1.00, 1.00, 1.00], 1004 [1.00, 1.00, 1.00],
635 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1005 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
636 [1.00, 0.00, 0.00], 1006 [1.00, 0.00, 0.00],
637 [1.00, 0.54, 0.00], 1007 [1.00, 0.54, 0.00],
638 [0.11, 0.56, 1.00], 1008 [0.11, 0.56, 1.00],
639 [0.93, 0.46, 0.00], 1009 [0.93, 0.46, 0.00],
640 [0.18, 0.54, 0.34], 1010 [0.18, 0.54, 0.34],
641 [0.56, 0.73, 0.56], 1011 [0.56, 0.73, 0.56],
642 [0.80, 0.80, 0.80], 1012 [0.80, 0.80, 0.80],
643 [0.75, 0.61, 0.20], 1013 [0.75, 0.61, 0.20],
644 [0.99, 0.77, 0.26], 1014 [0.99, 0.77, 0.26],
645 [0.74, 0.65, 0.41], 1015 [0.74, 0.65, 0.41],
646 ); 1016);
647 1017
648 my $fg = $color[$color % @color]; 1018sub msg {
1019 my ($self, $color, $type, $text, @extra) = @_;
649 1020
1021 $text = sanitise_xml $text;
1022
1023 if (my $cb = $self->{cb_msg}{$type}) {
1024 $_->($self, $color, $type, $text, @extra) for values %$cb;
1025 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1026 $type =~ s/-/_/g;
1027 $self->{$type} = $text;
1028 } else {
650 $self->logprint ("info: ", $text); 1029 $self->logprint ("msg: ", $text);
1030 return if $color < 0; # negative color == ignore if not understood
651 1031
1032 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1033
652 # 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
1035 # no longer neecssary with TRT servers
653 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1036 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
654 1037
655 $text = CFPlus::asxml $text;
656 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
657 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
658
659 ::message ({ fg => $fg, markup => $_ })
660 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 });
661 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 }
1053
662 $self->{statusbox}->add ($text, 1054 $self->{statusbox}->add ($text,
663 group => $text, 1055 group => $text,
664 fg => $fg, 1056 fg => $fg,
665 timeout => $color >= 2 ? 180 : 10, 1057 timeout => $color >= 2 ? 180 : 10,
666 tooltip_font => $::FONT_FIXED, 1058 tooltip_font => $::FONT_FIXED,
667 ); 1059 ) if $type eq "info";
668} 1060 }
669
670sub drawextinfo {
671 my ($self, $color, $type, $subtype, $message) = @_;
672
673 $self->drawinfo ($color, $message);
674} 1061}
675 1062
676sub spell_add { 1063sub spell_add {
677 my ($self, $spell) = @_; 1064 my ($self, $spell) = @_;
678 1065
… …
726 $self->{map_widget}->clr_commands; 1113 $self->{map_widget}->clr_commands;
727 1114
728 ::stop_game (); 1115 ::stop_game ();
729} 1116}
730 1117
731sub image_info {
732 my ($self, $numfaces) = @_;
733
734 $self->{num_faces} = $numfaces;
735 $self->{face_prefetch} = [1 .. $numfaces];
736 $self->face_prefetch;
737}
738
739sub face_prefetch {
740 my ($self) = @_;
741
742 return unless $::CFG->{face_prefetch};
743
744 if ($self->{num_faces}) {
745 return if @{ $self->{send_queue} || [] };
746 my $todo = @{ $self->{face_prefetch} }
747 or return;
748
749 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
750
751 $self->send ("requestinfo image_sums $face $face");
752
753 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
754 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
755 } elsif (!exists $self->{num_faces}) {
756 $self->send ("requestinfo image_info");
757
758 $self->{num_faces} = 0;
759
760 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
761 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
762 }
763}
764
765sub update_floorbox { 1118sub update_floorbox {
766 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1119 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
767 return unless $::CONN; 1120 return unless $::CONN;
768 1121
769 $::FLOORBOX->clear; 1122 $::FLOORBOX->clear;
1123
1124 my @add;
770 1125
771 my $row; 1126 my $row;
772 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} }) {
773 if ($row < 6) { 1128 if ($row < 6) {
774 local $_->{face_widget}; # hack to force recreation of widget 1129 local $_->{face_widget}; # hack to force recreation of widget
775 local $_->{desc_widget}; # hack to force recreation of widget 1130 local $_->{desc_widget}; # hack to force recreation of widget
776 CFPlus::Item::update_widgets $_; 1131 CFPlus::Item::update_widgets $_;
777 1132
1133 push @add,
778 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1134 0, $row, $_->{face_widget},
779 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1135 1, $row, $_->{desc_widget};
780 1136
781 $row++; 1137 $row++;
782 } else { 1138 } else {
783 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1139 push @add, 1, $row, new CFPlus::UI::Button
784 text => "More...", 1140 text => "More...",
785 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
786 ); 1142 ;
787 last; 1143 last;
788 } 1144 }
789 } 1145 }
790 if ($::CONN->{open_container}) { 1146 if ($::CONN->{open_container}) {
791 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1147 push @add, 1, $row++, new CFPlus::UI::Button
792 text => "Close container", 1148 text => "Close container",
793 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
794 ); 1150 ;
795 } 1151 }
1152
1153 $::FLOORBOX->add_at (@add);
796 }); 1154 });
797 1155
798 $::WANT_REFRESH++; 1156 $::WANT_REFRESH->start;
799} 1157}
800 1158
801sub set_opencont { 1159sub set_opencont {
802 my ($conn, $tag, $name) = @_; 1160 my ($conn, $tag, $name) = @_;
803 $conn->{open_container} = $tag; 1161 $conn->{open_container} = $tag;
804 update_floorbox; 1162 update_floorbox;
805 1163
806 $::INV_RIGHT_HB->clear (); 1164 $::INVR_HB->clear ();
807 $::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);
808 1166
809 if ($tag != 0) { # Floor isn't closable, is it? 1167 if ($tag != 0) { # Floor isn't closable, is it?
810 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1168 $::INVR_HB->add (new CFPlus::UI::Button
811 text => "Close container", 1169 text => "Close container",
812 tooltip => "Close the currently open container (if one is open)", 1170 tooltip => "Close the currently open container (if one is open)",
813 on_activate => sub { 1171 on_activate => sub {
814 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
815 if $tag != 0; 1173 if $tag != 0;
816 #if $CONN->{open_container} != 0;
817 0 1174 0
818 }, 1175 },
819 ); 1176 );
820 } 1177 }
821 1178
… …
911 $::SERVER_INFO->set_markup ( 1268 $::SERVER_INFO->set_markup (
912 "server <tt>$self->{host}:$self->{port}</tt>\n" 1269 "server <tt>$self->{host}:$self->{port}</tt>\n"
913 . "protocol version <tt>$self->{version}</tt>\n" 1270 . "protocol version <tt>$self->{version}</tt>\n"
914 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1271 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
915 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1272 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1273 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
916 . "editing support $yesno[!!$self->{editor_support}]\n" 1274 . "editing support $yesno[!!$self->{editor_support}]\n"
917 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1275 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1276 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
918 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1277 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
919 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1278 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
920 . "map size $self->{mapw}×$self->{maph}\n" 1279 . "map size $self->{mapw}×$self->{maph}\n"
921 ); 1280 );
922 1281
923 ::setup_build_button ($self->{editor_support}->{builder_ui});
924} 1282}
925 1283
926sub logged_in { 1284sub logged_in {
927 my ($self) = @_; 1285 my ($self) = @_;
928 1286
929 $self->send_ext_req (cfplus_support => version => 1, sub { 1287 $self->send_ext_req (cfplus_support => version => 2, sub {
1288 my (%msg) = @_;
1289
930 $self->{cfplus_ext} = $_[0]{version}; 1290 $self->{cfplus_ext} = $msg{version};
931 $self->update_server_info; 1291 $self->update_server_info;
932 1292
933 if ($self->{cfplus_ext} >= 2) { 1293 if ($self->{cfplus_ext} >= 2) {
934 $self->send_ext_req ("editor_support", sub { 1294 $self->send_ext_req ("editor_support", sub {
935 $self->{editor_support} = $_[0]; 1295 $self->{editor_support} = { @_ };
936 $self->update_server_info; 1296 $self->update_server_info;
937 1297
938 0 1298 0
939 }); 1299 });
940 } 1300 }
… …
942 0 1302 0
943 }); 1303 });
944 1304
945 $self->update_server_info; 1305 $self->update_server_info;
946 1306
947 $self->send_command ("output-sync $::CFG->{output_sync}");
948 $self->send_command ("output-count $::CFG->{output_count}");
949 $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;
950 $self->send_command ("pickup $::CFG->{pickup}"); 1308 $self->send_command ("pickup $::CFG->{pickup}");
951} 1309}
952 1310
953sub buildat {
954 my ($self, $builditem, $x, $y) = @_;
955
956 if ($self->{cfplus_ext}) {
957 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
958 }
959}
960
961sub lookat { 1311sub lookat {
962 my ($self, $x, $y) = @_; 1312 my ($self, $x, $y) = @_;
963 1313
964 if ($self->{cfplus_ext}) { 1314 if ($self->{cfplus_ext}) {
965 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1315 $self->send_ext_req (lookat => $x, $y, sub {
966 my ($msg) = @_; 1316 my (%msg) = @_;
967 1317
968 if (exists $msg->{npc_dialog}) { 1318 if (exists $msg{npc_dialog}) {
969 # start npc chat dialog 1319 # start npc chat dialog
970 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1320 $self->{npc_dialog} = new CFPlus::NPCDialog::
971 dx => $x, 1321 token => $msg{npc_dialog},
972 dy => $y,
973 title => "$msg->{npc_dialog} (NPC)", 1322 title => "$msg{npc_dialog}[0] (NPC)",
974 conn => $self, 1323 conn => $self,
975 ; 1324 ;
976 } 1325 }
977 }); 1326 });
978 } 1327 }
… …
985 1334
986 (delete $self->{npc_dialog})->destroy 1335 (delete $self->{npc_dialog})->destroy
987 if $self->{npc_dialog}; 1336 if $self->{npc_dialog};
988 1337
989 $self->SUPER::destroy; 1338 $self->SUPER::destroy;
1339
1340 %$self = ();
990} 1341}
991 1342
992package CFPlus::NPCDialog; 1343package CFPlus::NPCDialog;
993 1344
994our @ISA = 'CFPlus::UI::Toplevel'; 1345our @ISA = 'CFPlus::UI::Toplevel';
… …
1041 on_activate => sub { $this->destroy; 1 }, 1392 on_activate => sub { $this->destroy; 1 },
1042 ; 1393 ;
1043 1394
1044 $self->update_options; 1395 $self->update_options;
1045 1396
1046 $self->{id} = $self->{conn}->send_ext_req ( 1397 $self->{id} = "npc-channel-" . $self->{conn}->token;
1047 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1398 $self->{conn}->connect_ext ($self->{id} => sub {
1048 sub { $this && $this->feed (@_) } 1399 $this->feed (@_) if $this;
1049 ); 1400 });
1401
1402 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1050 1403
1051 $self->{entry}->grab_focus; 1404 $self->{entry}->grab_focus;
1052 1405
1053 $self->{textview}->add_paragraph ({ 1406 $self->{textview}->add_paragraph ({
1054 fg => [1, 1, 0, 1], 1407 fg => [1, 1, 0, 1],
… …
1077 ); 1430 );
1078 } 1431 }
1079} 1432}
1080 1433
1081sub feed { 1434sub feed {
1082 my ($self, $msg) = @_; 1435 my ($self, $type, @arg) = @_;
1083 1436
1084 CFPlus::weaken $self; 1437 CFPlus::weaken $self;
1085 1438
1086 if ($msg->{msgtype} eq "reply") { 1439 if ($type eq "update") {
1440 my (%info) = @arg;
1441
1087 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1442 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1088 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1443 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1089
1090 my $text = "\n" . CFPlus::asxml $msg->{msg};
1091 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1092 my @link;
1093 $text =~ s{
1094 ($match)
1095 }{
1096 my $kw = $1;
1097
1098 push @link, new CFPlus::UI::Label
1099 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1100 can_hover => 1,
1101 can_events => 1,
1102 padding_x => 0,
1103 padding_y => 0,
1104 on_button_up => sub {
1105 $self->send ($kw);
1106 };
1107
1108 "\x{fffc}"
1109 }giex;
1110 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
1111 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1467 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1112 $self->{textview}->scroll_to_bottom; 1468 $self->{textview}->scroll_to_bottom;
1469 }
1470
1113 $self->update_options; 1471 $self->update_options;
1114 } else { 1472 } else {
1115 $self->destroy; 1473 $self->destroy;
1116 } 1474 }
1117 1475
… …
1122 my ($self, $msg) = @_; 1480 my ($self, $msg) = @_;
1123 1481
1124 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1482 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1125 $self->{textview}->scroll_to_bottom; 1483 $self->{textview}->scroll_to_bottom;
1126 1484
1127 $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);
1128} 1486}
1129 1487
1130sub destroy { 1488sub destroy {
1131 my ($self) = @_; 1489 my ($self) = @_;
1132 1490
1133 #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
1134 1492
1135 if ($self->{conn}) { 1493 if ($self->{conn}) {
1136 $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};
1137 delete $self->{conn}{npc_dialog}; 1495 delete $self->{conn}{npc_dialog};
1138 $self->{conn}->disconnect_ext ($self->{id}); 1496 $self->{conn}->disconnect_ext ($self->{id});
1139 } 1497 }
1140 1498
1141 $self->SUPER::destroy; 1499 $self->SUPER::destroy;

Diff Legend

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