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.163 by root, Wed Aug 22 21:17:32 2007 UTC vs.
Revision 1.192 by root, Thu Mar 27 20:42:23 2008 UTC

1package CFPlus::Protocol; 1package DC::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 DC;
9use CFPlus::DB; 9use DC::DB;
10use CFPlus::UI; 10use DC::UI;
11use CFPlus::Pod; 11use DC::Pod;
12use CFPlus::Macro; 12use DC::Macro;
13use CFPlus::Item; 13use DC::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
18 16
19sub new { 17sub new {
20 my ($class, %arg) = @_; 18 my ($class, %arg) = @_;
21 19
22 my $self = $class->SUPER::new (%arg, 20 my $self = $class->SUPER::new (%arg,
23 setup_req => { 21 setup_req => {
24 extmap => 1, 22 extmap => 1,
25 excmd => 1, 23 excmd => 1,
26 xwidget1 => 1,#d# 24 widget => 2,
27 %{$arg{setup_req} || {}}, 25 %{$arg{setup_req} || {}},
28 }, 26 },
29 ); 27 );
30 28
31 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
32 30
33 my @cmd_help = map { 31 my @cmd_help = map {
34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
35 or die "unparseable command help: $_->{kw}[0]"; 33 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
36 34
37 my $cmd = $1; 35 my $cmd = $1;
38 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
39 @args = (".*") unless @args; 37 @args = (".*") unless @args;
40 38
41 my (undef, @par) = CFPlus::Pod::section_of $_; 39 my (undef, @par) = DC::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par; 40 my $text = DC::Pod::as_label @par;
43 41
44 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
45 for @args; 43 for @args;
46 44
47 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
48 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
49 @args 47 @args
50 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
51 CFPlus::Pod::find command => "*"; 49 DC::Pod::find command => "*";
52 50
53 $self->{json_coder} 51 $self->{json_coder}
54 ->convert_blessed 52 ->convert_blessed
55 ->filter_json_single_key_object (__w_ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
56 $self->{widget}{$_[0]} 54 $self->{widget}{$_[0]}
55 })
56 ->filter_json_single_key_object ("\fc" => sub {
57 my ($id) = @_;
58 sub {
59 $self->send_exti_msg (w_e => $id, @_);
60 }
57 }); 61 });
58 62
59 # destroy widgets on logout 63 # destroy widgets on logout
60 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
61 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
66 70
67 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
68 for @cmd_help; 72 for @cmd_help;
69 73
70 { 74 {
71 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
72 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
73 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 77 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
74 } 78 }
75 79
76 { 80 {
77 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
78 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
79 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 83 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
80 } 84 }
81 85
82 $self->{open_container} = 0; 86 $self->{open_container} = 0;
83 87
… …
98} 102}
99 103
100sub ext_capabilities { 104sub ext_capabilities {
101 my ($self, %cap) = @_; 105 my ($self, %cap) = @_;
102 106
103 #$self->send ("setup sound 0"); # we use a different protocol
104 $self->update_fx_want; 107 $self->update_fx_want;
105 108
106 $self->send_exti_req (resource => "exp_table", sub { 109 $self->send_exti_req (resource => "exp_table", sub {
107 my ($exp_table) = @_; 110 my ($exp_table) = @_;
108 111
… …
138############################################################################# 141#############################################################################
139 142
140sub widget_associate { 143sub widget_associate {
141 my ($self, $ws, $id, $widget) = @_; 144 my ($self, $ws, $id, $widget) = @_;
142 145
143 if ($widget) { 146 $widget ||= new DC::UI::Bin;
147
144 $widget->{s_id} = $id; 148 $widget->{s_id} = $id;
145 $self->{widget}{$id} = $widget; 149 $self->{widget}{$id} = $widget;
146 150
147 if ($ws) { 151 if ($ws) {
148 $widget->{s_ws} = $ws; 152 $widget->{s_ws} = $ws;
149 $self->{widgetset}{$ws}{w}{$id} = $widget; 153 $self->{widgetset}{$ws}{w}{$id} = $widget;
150 } 154 }
151 155
152 $widget->connect (on_destroy => sub { 156 $widget->connect (on_destroy => sub {
153 my ($widget) = @_; 157 my ($widget) = @_;
154 158
155 delete $self->{widget}{$widget->{s_id}}; 159 delete $self->{widget}{$widget->{s_id}};
156 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} 160 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
157 if exists $widget->{s_ws}; 161 if exists $widget->{s_ws};
158 }); 162 });
159
160 1
161 } else {
162 $self->send_exti_msg (w_e => $id, undef);
163
164 0
165 }
166} 163}
167 164
168# widgetset new 165# widgetset new
169sub ext_ws_n { 166sub ext_ws_n {
170 my ($self, $id) = @_; 167 my ($self, $id) = @_;
… …
187 184
188# widgetset create 185# widgetset create
189sub ext_ws_c { 186sub ext_ws_c {
190 my ($self, $ws, $id, $class, $args) = @_; 187 my ($self, $ws, $id, $class, $args) = @_;
191 188
192 for my $ev (grep /^on_/, keys %$args) {
193 my $rid = $args->{$ev};
194 $args->{$ev} = sub {
195 my $id = shift->{s_id};
196 $self->send_exti_msg (w_e => $id, $rid, @_);
197
198 1
199 };
200 }
201
202 $self->widget_associate ( 189 $self->widget_associate (
203 $ws, $id => scalar eval { 190 $ws, $id => scalar eval {
204 local $SIG{__DIE__}; 191 local $SIG{__DIE__};
205 "CFPlus::UI::$class"->new (%$args) 192 "DC::UI::$class"->new (%$args)
193 }
194 );
195}
196
197# widgetset create template
198sub ext_ws_ct {
199 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
200
201 $done_cb ||= sub { };
202
203 my $parse_list; $parse_list = sub {
204 my ($list) = @_;
205 my @w;
206
207 while (@$list) {
208 my ($class, $args) = splice @$list, 0, 2;
209 my $name = delete $args->{s_id};
210 my $cl = delete $args->{s_cl};
211 my $cfg = delete $cfg->{$name};
212 my $id = delete $cfg->{id};
213 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
214 or next;
215
216 $self->widget_associate ($ws, $id, $w)
217 if $id;
218
219 $w->add ($parse_list->($cl))
220 if $cl;
221
222 push @w, $w;
223 }
224
225 @w
226 };
227
228 # either array reference, or face #
229 if ($type eq "inline") {
230 $done_cb->();
231 $parse_list->($template);
232 } elsif ($type eq "face") {
233 my $handler; $handler = $self->register_face_handler ($template, sub {
234 my ($face) = @_;
235
236 undef $handler;
237 $done_cb->();
238 $parse_list->($self->{json_coder}->decode ($face->{data}));
206 } 239 });
207 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; 240 } else {
241 $done_cb->(0);
242 }
208} 243}
209 244
210# widgetset associate 245# widgetset associate
211sub ext_ws_a { 246sub ext_ws_a {
212 my ($self, %ass) = @_; 247 my ($self, %ass) = @_;
213 248
214 # everything that has a name, wether conceivably useful or not 249 # everything that has a name, wether conceivably useful or not
215 my %wkw = ( 250 my %wkw = (
216 root => $CFPlus::UI::ROOT, 251 root => $DC::UI::ROOT,
217 tooltip => $CFPlus::UI::TOOLTIP, 252 tooltip => $DC::UI::TOOLTIP,
218 253
219 mapwidget => $::MAPWIDGET, 254 mapwidget => $::MAPWIDGET,
220 buttonbar => $::BUTTONBAR, 255 buttonbar => $::BUTTONBAR,
221 metaserver => $::METASERVER, 256 metaserver => $::METASERVER,
222 buttonbar => $::BUTTONBAR, 257 buttonbar => $::BUTTONBAR,
… …
240 spell_list => $::SPELL_LIST, 275 spell_list => $::SPELL_LIST,
241 276
242 floorbox => $::FLOORBOX, 277 floorbox => $::FLOORBOX,
243 help_window => $::HELP_WINDOW, 278 help_window => $::HELP_WINDOW,
244 message_window => $::MESSAGE_WINDOW, 279 message_window => $::MESSAGE_WINDOW,
280 message_dist => $::MESSAGE_DIST,
245 statusbox => $::SDTATUSBOX, 281 statusbox => $::SDTATUSBOX,
246 282
247 inv => $::INV, 283 inv => $::INV,
248 invr => $::INVR, 284 invr => $::INVR,
249 invr_hb => $::INVR_HB, 285 invr_hb => $::INVR_HB,
250 ); 286 );
251 287
252 while (my ($id, $name) = each %ass) { 288 while (my ($id, $name) = each %ass) {
253 $self->widget_associate (undef, $id => $wkw{$name}) 289 $self->widget_associate (undef, $id => $wkw{$name});
254 or warn "server failed to associate non-existent well-known widget $name\n";
255 } 290 }
256} 291}
257 292
258# widget call 293# widget call
259sub ext_w_c { 294sub ext_w_c {
260 my ($self, $id, $rid, $method, @args) = @_; 295 my ($self, $id, $rcb, $method, @args) = @_;
261 296
262 my $w = $self->{widget}{$id} 297 my $w = $self->{widget}{$id}
263 or return; 298 or return;
264 299
265 if ($rid) { 300 if ($rcb) {
266 $self->send_exti_msg (w_r => $rid, $w->$method (@args)); 301 $rcb->($w->$method (@args));
267 } else { 302 } else {
268 $w->$method (@args); 303 $w->$method (@args);
269 } 304 }
270} 305}
271 306
… …
287 } 322 }
288} 323}
289 324
290# widget get 325# widget get
291sub ext_w_g { 326sub ext_w_g {
292 my ($self, $id, $rid, $attr) = @_; 327 my ($self, $id, $rid, @attr) = @_;
293 328
294 my $w = $self->{widget}{$id} 329 my $w = $self->{widget}{$id}
295 or return; 330 or return;
296 331
297 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 332 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
298} 333}
299 334
300# message window 335# message window
301sub ext_channel_info { 336sub ext_channel_info {
302 my ($self, $info) = @_; 337 my ($self, $info) = @_;
303 $self->{channels}->{$info->{id}} = $info; 338 $self->{channels}->{$info->{id}} = $info;
304 $::MESSAGE_WINDOW->add_channel ($info); 339 $::MESSAGE_DIST->add_channel ($info);
305} 340}
306 341
307############################################################################# 342#############################################################################
308 343
309sub logprint { 344sub logprint {
310 my ($self, @a) = @_; 345 my ($self, @a) = @_;
311 346
312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 347 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
313} 348}
314 349
315sub _stat_numdiff { 350sub _stat_numdiff {
316 my ($self, $name, $old, $new) = @_; 351 my ($self, $name, $old, $new) = @_;
317 352
… …
401 436
402 if ( 437 if (
403 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 438 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
404 ) { 439 ) {
405 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 440 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
406 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 441 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
407 } 442 }
408 443
409 $self->update_stats_window ($stats, $prev); 444 $self->update_stats_window ($stats, $prev);
410 445
411 $self->{prev_stats} = { %$stats }; 446 $self->{prev_stats} = { %$stats };
… …
489 $self->{stat_order} = join ",", map $_->[0], @order; 524 $self->{stat_order} = join ",", map $_->[0], @order;
490 525
491 $sktbl->clear; 526 $sktbl->clear;
492 527
493 my $sw = $self->{skillwid}{""} ||= [ 528 my $sw = $self->{skillwid}{""} ||= [
494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 529 0, 0, (new DC::UI::Label text => "Experience", align => 1),
495 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 530 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
496 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 531 2, 0, (new DC::UI::Label text => "Progress"),
497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 532 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 533 4, 0, (new DC::UI::Label text => "Experience", align => 1),
499 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 534 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
500 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 535 6, 0, (new DC::UI::Label text => "Progress"),
501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 536 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
502 ]; 537 ];
503 538
504 my @add = @$sw; 539 my @add = @$sw;
505 540
506 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 541 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
… …
518 if ($ev->{button} == 1) { 553 if ($ev->{button} == 1) {
519 $::CONN->user_send ("ready_skill $name"); 554 $::CONN->user_send ("ready_skill $name");
520 } elsif ($ev->{button} == 2) { 555 } elsif ($ev->{button} == 2) {
521 $::CONN->user_send ("use_skill $name"); 556 $::CONN->user_send ("use_skill $name");
522 } elsif ($ev->{button} == 3) { 557 } elsif ($ev->{button} == 3) {
523 my $shortname = CFPlus::shorten $name, 14; 558 my $shortname = DC::shorten $name, 14;
524 (new CFPlus::UI::Menu 559 (new DC::UI::Menu
525 items => [ 560 items => [
526 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 561 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
527 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 562 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
528 ], 563 ],
529 )->popup ($ev); 564 )->popup ($ev);
530 } else { 565 } else {
531 return 0; 566 return 0;
532 } 567 }
… …
534 1 569 1
535 }; 570 };
536 571
537 my $sw = $self->{skillwid}{$idx} ||= [ 572 my $sw = $self->{skillwid}{$idx} ||= [
538 # exp 573 # exp
539 (new CFPlus::UI::Label 574 (new DC::UI::Label
540 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 575 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
541 576
542 # level 577 # level
543 (new CFPlus::UI::Label 578 (new DC::UI::Label
544 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 579 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
545 580
546 # progress 581 # progress
547 (new CFPlus::UI::ExperienceProgress), 582 (new DC::UI::ExperienceProgress),
548 583
549 # label 584 # label
550 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 585 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
551 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 586 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
552 ]; 587 ];
553 588
554 push @add, 589 push @add,
555 $x * 4 + 0, $y, $sw->[0], 590 $x * 4 + 0, $y, $sw->[0],
556 $x * 4 + 1, $y, $sw->[1], 591 $x * 4 + 1, $y, $sw->[1],
… …
566 601
567 for (@order) { 602 for (@order) {
568 my ($idx, $name) = @$_; 603 my ($idx, $name) = @$_;
569 my $val = $stats->{$idx}; 604 my $val = $stats->{$idx};
570 605
571 next if $prev->{$idx}[1] == $val->[1]; 606 next if $prev->{$idx}[1] eq $val->[1];
572 607
573 my $sw = $self->{skillwid}{$idx}; 608 my $sw = $self->{skillwid}{$idx};
574 $sw->[0]->set_text (::formsep ($val->[1])); 609 $sw->[0]->set_text (::formsep ($val->[1]));
575 $sw->[1]->set_text ($val->[0] * 1); 610 $sw->[1]->set_text ($val->[0] * 1);
576 $sw->[2]->set_value (@$val); 611 $sw->[2]->set_value (@$val);
577 612
578 #$::GAUGES->{sklprg}->set_label ($name); 613 $::GAUGES->{sklprg}->set_label ("$name %d%%");
579 $::GAUGES->{sklprg}->set_value (@$val); 614 $::GAUGES->{sklprg}->set_value (@$val);
580 }
581}
582
583sub macro_send {
584 my ($self, $macro) = @_;
585
586 for my $cmd (@{ $macro->{action} }) {
587 $self->send_command ($cmd);
588 } 615 }
589} 616}
590 617
591sub user_send { 618sub user_send {
592 my ($self, $command) = @_; 619 my ($self, $command) = @_;
… …
594 $self->{record}->($command) 621 $self->{record}->($command)
595 if $self->{record}; 622 if $self->{record};
596 623
597 $self->logprint ("send: ", $command); 624 $self->logprint ("send: ", $command);
598 $self->send_command ($command); 625 $self->send_command ($command);
599 ::status ($command);
600} 626}
601 627
602sub record { 628sub record {
603 my ($self, $cb) = @_; 629 my ($self, $cb) = @_;
604 630
… …
635 } 661 }
636 } 662 }
637 663
638 if ($delay) { 664 if ($delay) {
639 # delay the map drawing a tiny bit in the hope of getting the missing fetched 665 # delay the map drawing a tiny bit in the hope of getting the missing fetched
640 Event->timer (after => 0.03, cb => sub { 666 EV::once undef, 0, 0.03, sub {
641 $_[0]->w->cancel;
642 $self->{map_widget}->update 667 $self->{map_widget}->update
643 if $self->{map_widget}; 668 if $self->{map_widget};
644 }); 669 };
645 } else { 670 } else {
646 $self->{map_widget}->update; 671 $self->{map_widget}->update;
647 } 672 }
648} 673}
649 674
… …
661 686
662 my ($hash, $x, $y, $w, $h) = @$map_info; 687 my ($hash, $x, $y, $w, $h) = @$map_info;
663 688
664 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 689 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
665 $self->{map_cache_new}{$hash} = \$data; 690 $self->{map_cache_new}{$hash} = \$data;
666 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 691 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
667} 692}
668 693
669sub map_clear { 694sub map_clear {
670 my ($self) = @_; 695 my ($self) = @_;
671 696
… …
684 do { 709 do {
685 $tile = pop @{$self->{bg_fetch}} 710 $tile = pop @{$self->{bg_fetch}}
686 or return; 711 or return;
687 } while $self->{texture}[$tile]; 712 } while $self->{texture}[$tile];
688 713
689 CFPlus::DB::get tilecache => $tile, sub { 714 DC::DB::get tilecache => $tile, sub {
690 my ($data) = @_; 715 my ($data) = @_;
691 716
692 return unless $self->{map}; # stop when destroyed 717 return unless $self->{map}; # stop when destroyed
693 718
694 if (defined $data) { 719 if (defined $data) {
… …
722 }; 747 };
723 748
724 if (my $rdata = $self->{map_cache_old}{$hash}) { 749 if (my $rdata = $self->{map_cache_old}{$hash}) {
725 $cb->($$rdata); 750 $cb->($$rdata);
726 } else { 751 } else {
727 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 752 DC::DB::get $self->{mapcache} => $hash, $cb;
728 } 753 }
729} 754}
730 755
731# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 756# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
732# (server resource,s latency, bandwidth), so this hack is warranted. 757# (server resource,s latency, bandwidth), so this hack is warranted.
… …
856 881
857sub face_find { 882sub face_find {
858 my ($self, $facenum, $face, $cb) = @_; 883 my ($self, $facenum, $face, $cb) = @_;
859 884
860 if ($face->{type} == 0) { # FT_FACE 885 if ($face->{type} == 0) { # FT_FACE
861 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 886 my $id = DC::DB::get_tile_id_sync $face->{name};
862 887
863 $face->{id} = $id; 888 $face->{id} = $id;
864 $self->{map}->set_tileid ($facenum => $id); 889 $self->{map}->set_tileid ($facenum => $id);
865 890
866 CFPlus::DB::get tilecache => $id, $cb; 891 DC::DB::get tilecache => $id, $cb;
867 892
868 } elsif ($face->{type} & 1) { # with metadata 893 } elsif ($face->{type} & 1) { # with metadata
869 CFPlus::DB::get res_meta => $face->{name}, $cb; 894 DC::DB::get res_meta => $face->{name}, $cb;
870 895
871 } else { # no metadata 896 } else { # no metadata
872 CFPlus::DB::get res_data => $face->{name}, $cb; 897 DC::DB::get res_data => $face->{name}, $cb;
873 } 898 }
874} 899}
875 900
876sub face_update { 901sub face_update {
877 my ($self, $facenum, $face, $changed) = @_; 902 my ($self, $facenum, $face, $changed) = @_;
878 903
879 if ($face->{type} == 0) { 904 if ($face->{type} == 0) {
880 # image, FT_FACE 905 # image, FT_FACE
881 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 906 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
882 if $changed; 907 if $changed;
883 908
884 $self->have_tile ($face->{id}, delete $face->{data}); 909 $self->have_tile ($face->{id}, delete $face->{data});
885 910
886 } elsif ($face->{type} & 1) { 911 } elsif ($face->{type} & 1) {
887 # split metadata case, FT_MUSIC, FT_SOUND 912 # split metadata case, FT_MUSIC, FT_SOUND
888 if ($changed) { # new data 913 if ($changed) { # new data
889 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 914 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
890 $face->{data} = $meta; 915 $face->{data} = $meta;
891 916
917 # rely on strict ordering here and also on later fetch
892 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 918 DC::DB::put res_data => $face->{name} => $data, sub { };
893 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 919 DC::DB::put res_meta => $face->{name} => $meta, sub { };
894 } 920 }
895 921
896 $face->{data} = $self->{json_coder}->decode ($face->{data}); 922 $face->{data} = $self->{json_coder}->decode ($face->{data});
897
898 ::add_license ($face); 923 ::add_license ($face);
924 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
925 if $changed;
899 926
900 if ($face->{type} == 3) { # FT_MUSIC 927 if ($face->{type} == 3) { # FT_MUSIC
901 ::message ({ markup => "downloaded song #$facenum" })
902 if $changed;
903
904 &::audio_music_push ($facenum); 928 &::audio_music_push ($facenum);
905 } elsif ($face->{type} == 5) { # FT_SOUND 929 } elsif ($face->{type} == 5) { # FT_SOUND
906 ::message ({ markup => "downloaded sound #$facenum" })
907 if $changed;
908
909 &::audio_sound_push ($facenum); 930 &::audio_sound_push ($facenum);
910 } 931 }
911 932
912 } else { 933 } else {
913 # flat resource case, FT_RSRC 934 # flat resource case, FT_RSRC
914 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 935 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
915 if $changed; 936 if $changed;
916 } 937 }
917 938
918 if (my $cbs = $self->{face_cb}{$facenum}) { 939 if (my $cbs = $self->{face_cb}{$facenum}) {
919 $_->($face, $changed) for @$cbs; 940 $_->($face, $changed) for @$cbs;
… …
930 my ($self, $tile, $data) = @_; 951 my ($self, $tile, $data) = @_;
931 952
932 return unless $self->{map}; 953 return unless $self->{map};
933 954
934 my $tex = $self->{texture}[$tile] ||= 955 my $tex = $self->{texture}[$tile] ||=
935 new CFPlus::Texture 956 new DC::Texture
936 tile => $tile, 957 tile => $tile,
937 image => $data, delete_image => 1, 958 image => $data, delete_image => 1,
938 minify => 1, mipmap => 1; 959 minify => 1, mipmap => 1;
939 960
940 if (my $cbs = delete $self->{tile_cb}{$tile}) { 961 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
948 my ($self, $num, $cb) = @_; 969 my ($self, $num, $cb) = @_;
949 970
950 push @{$self->{face_cb}{$num}}, $cb; 971 push @{$self->{face_cb}{$num}}, $cb;
951 972
952 defined wantarray 973 defined wantarray
953 ? CFPlus::guard { 974 ? DC::guard {
954 @{$self->{face_cb}{$num}} 975 @{$self->{face_cb}{$num}}
955 = grep $_ != $cb, 976 = grep $_ != $cb,
956 @{$self->{face_cb}{$num}}; 977 @{$self->{face_cb}{$num}};
957 } 978 }
958 : () 979 : ()
… …
993 1014
994sub sanitise_xml($) { 1015sub sanitise_xml($) {
995 local $_ = shift; 1016 local $_ = shift;
996 1017
997 # we now weed out all tags we do not support 1018 # we now weed out all tags we do not support
998 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1019 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1020 }{
1021 "&lt;"
1022 }gex;
1023
999 # now all entities 1024 # now all entities
1000 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1025 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
1001 1026
1002 # handle some elements 1027 # handle some elements
1003 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1028 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
1056 1081
1057 ## try to create single paragraphs of multiple lines sent by the server 1082 ## try to create single paragraphs of multiple lines sent by the server
1058 # no longer neecssary with TRT servers 1083 # no longer neecssary with TRT servers
1059 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1084 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1060 1085
1086 for (split /\n/, $text) {
1061 ::message ({ 1087 ::message ({
1062 fg => $fg, 1088 fg => $fg,
1063 markup => $_, 1089 markup => $_,
1064 type => $type, 1090 type => $type,
1065 extra => [@extra], 1091 extra => [@extra],
1066 color_flags => $color 1092 color_flags => $color, #d# ugly, kill
1067 }) for split /\n/, $text; 1093 });
1094
1095 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1096 # actually, this is an ugly design. _we_ should control the channels,
1097 # not some random other widget, as the channels are clearly protocol-specific.
1098 # then we could also react to flags such as CLEAR without resorting to
1099 # hacks such as color_flags, above.
1100 }
1068 1101
1069 $self->{statusbox}->add ($text, 1102 $self->{statusbox}->add ($text,
1070 group => $text, 1103 group => $text,
1071 fg => $fg, 1104 fg => $fg,
1072 timeout => $color >= 2 ? 180 : 10, 1105 timeout => $color >= 2 ? 180 : 10,
1073 tooltip_font => $::FONT_FIXED, 1106 tooltip_font => $::FONT_FIXED,
1074 ); 1107 ) if $type eq "info";
1075 } 1108 }
1076} 1109}
1077 1110
1078sub spell_add { 1111sub spell_add {
1079 my ($self, $spell) = @_; 1112 my ($self, $spell) = @_;
… …
1083 $spell->{message} =~ s/\n+$//; 1116 $spell->{message} =~ s/\n+$//;
1084 $spell->{message} ||= "Server did not provide a description for this spell."; 1117 $spell->{message} ||= "Server did not provide a description for this spell.";
1085 1118
1086 $::SPELL_LIST->add_spell ($spell); 1119 $::SPELL_LIST->add_spell ($spell);
1087 1120
1088 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1121 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
1089 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1122 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
1090} 1123}
1091 1124
1092sub spell_delete { 1125sub spell_delete {
1093 my ($self, $spell) = @_; 1126 my ($self, $spell) = @_;
1094 1127
… …
1105sub addme_success { 1138sub addme_success {
1106 my ($self) = @_; 1139 my ($self) = @_;
1107 1140
1108 my %skill_help; 1141 my %skill_help;
1109 1142
1110 for my $node (CFPlus::Pod::find skill_description => "*") { 1143 for my $node (DC::Pod::find skill_description => "*") {
1111 my (undef, @par) = CFPlus::Pod::section_of $node; 1144 my (undef, @par) = DC::Pod::section_of $node;
1112 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1145 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
1113 }; 1146 };
1114 1147
1115 for my $skill (values %{$self->{skill_info}}) { 1148 for my $skill (values %{$self->{skill_info}}) {
1116 $self->{map_widget}->add_command ("ready_skill $skill", 1149 $self->{map_widget}->add_command ("ready_skill $skill",
1117 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1150 (DC::asxml "Ready the skill '$skill'\n\n")
1118 . $skill_help{$skill}); 1151 . $skill_help{$skill});
1119 $self->{map_widget}->add_command ("use_skill $skill", 1152 $self->{map_widget}->add_command ("use_skill $skill",
1120 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1153 (DC::asxml "Immediately use the skill '$skill'\n\n")
1121 . $skill_help{$skill}); 1154 . $skill_help{$skill});
1122 } 1155 }
1123} 1156}
1124 1157
1125sub eof { 1158sub eof {
… …
1129 1162
1130 ::stop_game (); 1163 ::stop_game ();
1131} 1164}
1132 1165
1133sub update_floorbox { 1166sub update_floorbox {
1134 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1167 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1135 return unless $::CONN; 1168 return unless $::CONN;
1136 1169
1137 $::FLOORBOX->clear; 1170 $::FLOORBOX->clear;
1138 1171
1139 my @add; 1172 my @add;
… …
1141 my $row; 1174 my $row;
1142 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1175 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1143 if ($row < 6) { 1176 if ($row < 6) {
1144 local $_->{face_widget}; # hack to force recreation of widget 1177 local $_->{face_widget}; # hack to force recreation of widget
1145 local $_->{desc_widget}; # hack to force recreation of widget 1178 local $_->{desc_widget}; # hack to force recreation of widget
1146 CFPlus::Item::update_widgets $_; 1179 DC::Item::update_widgets $_;
1147 1180
1148 push @add, 1181 push @add,
1149 0, $row, $_->{face_widget}, 1182 0, $row, $_->{face_widget},
1150 1, $row, $_->{desc_widget}; 1183 1, $row, $_->{desc_widget};
1151 1184
1152 $row++; 1185 $row++;
1153 } else { 1186 } else {
1154 push @add, 1, $row, new CFPlus::UI::Button 1187 push @add, 1, $row, new DC::UI::Button
1155 text => "More...", 1188 text => "More...",
1156 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1189 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1157 ; 1190 ;
1158 last; 1191 last;
1159 } 1192 }
1160 } 1193 }
1161 if ($::CONN->{open_container}) { 1194 if ($::CONN->{open_container}) {
1162 push @add, 1, $row++, new CFPlus::UI::Button 1195 push @add, 1, $row++, new DC::UI::Button
1163 text => "Close container", 1196 text => "Close container",
1164 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1197 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1165 ; 1198 ;
1166 } 1199 }
1167 1200
1168 $::FLOORBOX->add_at (@add); 1201 $::FLOORBOX->add_at (@add);
1169 }); 1202 });
1170 1203
1171 $::WANT_REFRESH->start; 1204 $::WANT_REFRESH = 1;
1172} 1205}
1173 1206
1174sub set_opencont { 1207sub set_opencont {
1175 my ($conn, $tag, $name) = @_; 1208 my ($conn, $tag, $name) = @_;
1176 $conn->{open_container} = $tag; 1209 $conn->{open_container} = $tag;
1177 update_floorbox; 1210 update_floorbox;
1178 1211
1179 $::INVR_HB->clear (); 1212 $::INVR_HB->clear ();
1180 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1213 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1181 1214
1182 if ($tag != 0) { # Floor isn't closable, is it? 1215 if ($tag != 0) { # Floor isn't closable, is it?
1183 $::INVR_HB->add (new CFPlus::UI::Button 1216 $::INVR_HB->add (new DC::UI::Button
1184 text => "Close container", 1217 text => "Close container",
1185 tooltip => "Close the currently open container (if one is open)", 1218 tooltip => "Close the currently open container (if one is open)",
1186 on_activate => sub { 1219 on_activate => sub {
1187 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1220 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1188 if $tag != 0; 1221 if $tag != 0;
… …
1195} 1228}
1196 1229
1197sub update_containers { 1230sub update_containers {
1198 my ($self) = @_; 1231 my ($self) = @_;
1199 1232
1200 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1233 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1201 my $todo = delete $self->{update_container} 1234 my $todo = delete $self->{update_container}
1202 or return; 1235 or return;
1203 1236
1204 for my $tag (keys %$todo) { 1237 for my $tag (keys %$todo) {
1205 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1238 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1242sub item_update { 1275sub item_update {
1243 my ($self, $item) = @_; 1276 my ($self, $item) = @_;
1244 1277
1245 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1278 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
1246 1279
1247 CFPlus::Item::update_widgets $item; 1280 DC::Item::update_widgets $item;
1248 1281
1249 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1282 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1250 set_opencont ($::CONN, 0, "Floor"); 1283 set_opencont ($::CONN, 0, "Floor");
1251 1284
1252 } elsif ($item->{flags} & F_OPEN) { 1285 } elsif ($item->{flags} & F_OPEN) {
1253 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1286 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1254 1287
1255 } else { 1288 } else {
1256 $self->{update_container}{$item->{container}}++; 1289 $self->{update_container}{$item->{container}}++;
1257 $self->update_containers; 1290 $self->update_containers;
1258 } 1291 }
… …
1269 1302
1270 my $weight = .001 * $self->{player}{weight}; 1303 my $weight = .001 * $self->{player}{weight};
1271 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1304 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1272 1305
1273 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1306 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1274 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1307 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1275 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1308 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1276} 1309}
1277 1310
1278sub update_server_info { 1311sub update_server_info {
1279 my ($self) = @_; 1312 my ($self) = @_;
… …
1287 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1320 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1288 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1321 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1289 . "editing support $yesno[!!$self->{editor_support}]\n" 1322 . "editing support $yesno[!!$self->{editor_support}]\n"
1290 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1323 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1291 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1324 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1292 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1325 . "client support $yesno[$self->{cfplus_ext} > 0]"
1293 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1326 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1294 . "map size $self->{mapw}×$self->{maph}\n" 1327 . "map size $self->{mapw}×$self->{maph}\n"
1295 ); 1328 );
1296 1329
1297} 1330}
… …
1317 0 1350 0
1318 }); 1351 });
1319 1352
1320 $self->update_server_info; 1353 $self->update_server_info;
1321 1354
1322 $self->send_command ("output-sync $::CFG->{output_sync}");
1323 $self->send_command ("output-count $::CFG->{output_count}");
1324 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1355 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1325 $self->send_command ("pickup $::CFG->{pickup}"); 1356 $self->send_command ("pickup $::CFG->{pickup}");
1326} 1357}
1327 1358
1328sub lookat { 1359sub lookat {
… …
1332 $self->send_ext_req (lookat => $x, $y, sub { 1363 $self->send_ext_req (lookat => $x, $y, sub {
1333 my (%msg) = @_; 1364 my (%msg) = @_;
1334 1365
1335 if (exists $msg{npc_dialog}) { 1366 if (exists $msg{npc_dialog}) {
1336 # start npc chat dialog 1367 # start npc chat dialog
1337 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1368 $self->{npc_dialog} = new DC::NPCDialog::
1338 token => $msg{npc_dialog}, 1369 token => $msg{npc_dialog},
1339 title => "$msg{npc_dialog}[0] (NPC)", 1370 title => "$msg{npc_dialog}[0] (NPC)",
1340 conn => $self, 1371 conn => $self,
1341 ; 1372 ;
1342 } 1373 }
… …
1355 $self->SUPER::destroy; 1386 $self->SUPER::destroy;
1356 1387
1357 %$self = (); 1388 %$self = ();
1358} 1389}
1359 1390
1360package CFPlus::NPCDialog; 1391package DC::NPCDialog;
1361 1392
1362our @ISA = 'CFPlus::UI::Toplevel'; 1393our @ISA = 'DC::UI::Toplevel';
1363 1394
1364sub new { 1395sub new {
1365 my $class = shift; 1396 my $class = shift;
1366 1397
1367 my $self = $class->SUPER::new ( 1398 my $self = $class->SUPER::new (
… …
1374 kw => { hi => 0, yes => 0, no => 0 }, 1405 kw => { hi => 0, yes => 0, no => 0 },
1375 has_close_button => 1, 1406 has_close_button => 1,
1376 @_, 1407 @_,
1377 ); 1408 );
1378 1409
1379 CFPlus::weaken (my $this = $self); 1410 DC::weaken (my $this = $self);
1380 1411
1381 $self->connect (delete => sub { $this->destroy; 1 }); 1412 $self->connect (delete => sub { $this->destroy; 1 });
1382 1413
1383 # better use a pane... 1414 # better use a pane...
1384 $self->add (my $hbox = new CFPlus::UI::HBox); 1415 $self->add (my $hbox = new DC::UI::HBox);
1385 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1416 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1386 1417
1387 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1418 $hbox->add (my $vbox = new DC::UI::VBox);
1388 1419
1389 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1420 $vbox->add (new DC::UI::Label text => "Message Entry:");
1390 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1421 $vbox->add ($self->{entry} = new DC::UI::Entry
1391 tooltip => "#npc_message_entry", 1422 tooltip => "#npc_message_entry",
1392 on_activate => sub { 1423 on_activate => sub {
1393 my ($entry, $text) = @_; 1424 my ($entry, $text) = @_;
1394 1425
1395 return unless $text =~ /\S/; 1426 return unless $text =~ /\S/;
… …
1399 1430
1400 0 1431 0
1401 }, 1432 },
1402 ); 1433 );
1403 1434
1404 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1435 $vbox->add ($self->{options} = new DC::UI::VBox);
1405 1436
1406 $self->{bye_button} = new CFPlus::UI::Button 1437 $self->{bye_button} = new DC::UI::Button
1407 text => "Bye (close)", 1438 text => "Bye (close)",
1408 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1439 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1409 on_activate => sub { $this->destroy; 1 }, 1440 on_activate => sub { $this->destroy; 1 },
1410 ; 1441 ;
1411 1442
… …
1430}; 1461};
1431 1462
1432sub update_options { 1463sub update_options {
1433 my ($self) = @_; 1464 my ($self) = @_;
1434 1465
1435 CFPlus::weaken $self; 1466 DC::weaken $self;
1436 1467
1437 $self->{options}->clear; 1468 $self->{options}->clear;
1438 $self->{options}->add ($self->{bye_button}); 1469 $self->{options}->add ($self->{bye_button});
1439 1470
1440 for my $kw (sort keys %{ $self->{kw} }) { 1471 for my $kw (sort keys %{ $self->{kw} }) {
1441 $self->{options}->add (new CFPlus::UI::Button 1472 $self->{options}->add (new DC::UI::Button
1442 text => $kw, 1473 text => $kw,
1443 on_activate => sub { 1474 on_activate => sub {
1444 $self->send ($kw); 1475 $self->send ($kw);
1445 0 1476 0
1446 }, 1477 },
… …
1449} 1480}
1450 1481
1451sub feed { 1482sub feed {
1452 my ($self, $type, @arg) = @_; 1483 my ($self, $type, @arg) = @_;
1453 1484
1454 CFPlus::weaken $self; 1485 DC::weaken $self;
1455 1486
1456 if ($type eq "update") { 1487 if ($type eq "update") {
1457 my (%info) = @arg; 1488 my (%info) = @arg;
1458 1489
1459 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1490 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1460 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1491 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1461 1492
1462 if (exists $info{msg}) { 1493 if (exists $info{msg}) {
1463 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1494 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1464 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1495 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1465 my @link; 1496 my @link;
1466 $text =~ s{ 1497 $text =~ s{
1467 ($match) 1498 ($match)
1468 }{ 1499 }{
1469 my $kw = $1; 1500 my $kw = $1;
1470 1501
1471 push @link, new CFPlus::UI::Label 1502 push @link, new DC::UI::Label
1472 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1503 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1473 can_hover => 1, 1504 can_hover => 1,
1474 can_events => 1, 1505 can_events => 1,
1475 padding_x => 0, 1506 padding_x => 0,
1476 padding_y => 0, 1507 padding_y => 0,
… …
1494} 1525}
1495 1526
1496sub send { 1527sub send {
1497 my ($self, $msg) = @_; 1528 my ($self, $msg) = @_;
1498 1529
1499 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1530 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1500 $self->{textview}->scroll_to_bottom; 1531 $self->{textview}->scroll_to_bottom;
1501 1532
1502 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1533 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1503} 1534}
1504 1535

Diff Legend

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