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.100 by root, Tue Apr 10 11:12:53 2007 UTC vs.
Revision 1.171 by root, Sat Sep 1 08:08:52 2007 UTC

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

Diff Legend

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