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

Diff Legend

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