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.159 by root, Tue Aug 21 17:54:02 2007 UTC vs.
Revision 1.185 by root, Thu Dec 27 19:12:19 2007 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;
… …
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->{par} <=> $b->{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 ($id) = @_; 167 my ($self, $id) = @_;
171 168
172 $self->{widgetset}{$id} = { 169 $self->{widgetset}{$id} = {
173 w => {}, 170 w => {},
174 }; 171 };
175} 172}
176 173
177# widgetset destroy 174# widgetset destroy
178sub ext_ws_d { 175sub ext_ws_d {
179 my ($id) = @_; 176 my ($self, $id) = @_;
180 177
181 my $ws = delete $self->{widgetset}{$id} 178 my $ws = delete $self->{widgetset}{$id}
182 or return; 179 or return;
183 180
184 $_->destroy 181 $_->destroy
185 for values %{$ws->{w}}; 182 for values %{$ws->{w}};
186} 183}
187 184
188# widgetset create 185# widgetset create
189sub ext_ws_c => sub { 186sub ext_ws_c {
190 my ($ws, $id, $class, $args) = @_; 187 my ($self, $ws, $id, $class, $args) = @_;
191
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 188
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
206 } 225 @w
207 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; 226 };
227
228 # either array reference, or face #
229 if ($type eq "inline") {
230 $parse_list->($template);
231 $done_cb->();
232 } elsif ($type eq "face") {
233 #...
234 $done_cb->(0);
235 } else {
236 $done_cb->(0);
237 }
208} 238}
209 239
210# widgetset associate 240# widgetset associate
211sub ext_ws_a { 241sub ext_ws_a {
212 my (%ass) = @_; 242 my ($self, %ass) = @_;
213 243
214 # everything that has a name, wether conceivably useful or not 244 # everything that has a name, wether conceivably useful or not
215 my %wkw = ( 245 my %wkw = (
216 root => $CFPlus::UI::ROOT, 246 root => $DC::UI::ROOT,
217 tooltip => $CFPlus::UI::TOOLTIP, 247 tooltip => $DC::UI::TOOLTIP,
218 248
219 mapwidget => $::MAPWIDGET, 249 mapwidget => $::MAPWIDGET,
220 buttonbar => $::BUTTONBAR, 250 buttonbar => $::BUTTONBAR,
221 metaserver => $::METASERVER, 251 metaserver => $::METASERVER,
222 buttonbar => $::BUTTONBAR, 252 buttonbar => $::BUTTONBAR,
… …
248 invr => $::INVR, 278 invr => $::INVR,
249 invr_hb => $::INVR_HB, 279 invr_hb => $::INVR_HB,
250 ); 280 );
251 281
252 while (my ($id, $name) = each %ass) { 282 while (my ($id, $name) = each %ass) {
253 $self->widget_associate (undef, $id => $wkw{$name}) 283 $self->widget_associate (undef, $id => $wkw{$name});
254 or warn "server failed to associate non-existent well-known widget $name\n";
255 } 284 }
256} 285}
257 286
258# widget call 287# widget call
259sub ext_w_c { 288sub ext_w_c {
260 my ($id, $rid, $method, @args) = @_; 289 my ($self, $id, $rcb, $method, @args) = @_;
261 290
262 my $w = $self->{widget}{$id} 291 my $w = $self->{widget}{$id}
263 or return; 292 or return;
264 293
265 if ($rid) { 294 if ($rcb) {
266 $self->send_exti_msg (w_r => $rid, $w->$method (@args)); 295 $rcb->($w->$method (@args));
267 } else { 296 } else {
268 $w->$method (@args); 297 $w->$method (@args);
269 } 298 }
270} 299}
271 300
272# widget set 301# widget set
273sub ext_w_s { 302sub ext_w_s {
274 my ($id, $attr) = @_; 303 my ($self, $id, $attr) = @_;
275 304
276 my $w = $self->{widget}{$id} 305 my $w = $self->{widget}{$id}
277 or return; 306 or return;
278 307
279 for (my $i = 0; $i < $#$attr; $i += 2) { 308 for (my $i = 0; $i < $#$attr; $i += 2) {
… …
287 } 316 }
288} 317}
289 318
290# widget get 319# widget get
291sub ext_w_g { 320sub ext_w_g {
292 my ($id, $rid, $attr) = @_; 321 my ($self, $id, $rid, @attr) = @_;
293 322
294 my $w = $self->{widget}{$id} 323 my $w = $self->{widget}{$id}
295 or return; 324 or return;
296 325
297 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 326 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
298}) 327}
299 328
300# message window 329# message window
301sub ext_channel_info { 330sub ext_channel_info {
302 my ($info) = @_; 331 my ($self, $info) = @_;
303 $self->{channels}->{$info->{id}} = $info; 332 $self->{channels}->{$info->{id}} = $info;
304 $::MESSAGE_WINDOW->add_channel ($info); 333 $::MESSAGE_WINDOW->add_channel ($info);
305} 334}
306 335
307############################################################################# 336#############################################################################
308 337
309sub logprint { 338sub logprint {
310 my ($self, @a) = @_; 339 my ($self, @a) = @_;
311 340
312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 341 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
313} 342}
314 343
315sub _stat_numdiff { 344sub _stat_numdiff {
316 my ($self, $name, $old, $new) = @_; 345 my ($self, $name, $old, $new) = @_;
317 346
… …
401 430
402 if ( 431 if (
403 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 432 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
404 ) { 433 ) {
405 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 434 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); 435 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
407 } 436 }
408 437
409 $self->update_stats_window ($stats, $prev); 438 $self->update_stats_window ($stats, $prev);
410 439
411 $self->{prev_stats} = { %$stats }; 440 $self->{prev_stats} = { %$stats };
… …
478 for keys %RES_TBL; 507 for keys %RES_TBL;
479 508
480 my $sktbl = $::STATWIDS->{skill_tbl}; 509 my $sktbl = $::STATWIDS->{skill_tbl};
481 my @skills = keys %{ $self->{skill_info} }; 510 my @skills = keys %{ $self->{skill_info} };
482 511
483 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 512 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
513 map [$_, $self->{skill_info}{$_}],
514 grep exists $stats->{$_},
515 @skills;
516
517 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
518 $self->{stat_order} = join ",", map $_->[0], @order;
519
484 $sktbl->clear; 520 $sktbl->clear;
485 521
486 my $sw = $self->{skillwid}{""} ||= [ 522 my $sw = $self->{skillwid}{""} ||= [
487 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 523 0, 0, (new DC::UI::Label text => "Experience", align => 1),
488 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 524 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
489 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 525 2, 0, (new DC::UI::Label text => "Progress", align => 0),
490 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 526 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
491 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 527 4, 0, (new DC::UI::Label text => "Experience", align => 1),
492 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 528 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
493 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 529 6, 0, (new DC::UI::Label text => "Progress", align => 0),
494 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 530 7, 0, (new DC::UI::Label text => "Skill", expand => 1),
495 ]; 531 ];
496 532
497 my @add = @$sw; 533 my @add = @$sw;
498 534
499 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 535 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
500 536
501 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 537 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
502 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 538 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
503 539
504 my ($x, $y) = (0, 1); 540 my ($x, $y) = (0, 1);
505 for ( 541 for (@order) {
506 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
507 map [$_, $self->{skill_info}{$_}],
508 grep exists $stats->{$_},
509 @skills
510 ) {
511 my ($idx, $name) = @$_; 542 my ($idx, $name) = @$_;
512 543
513 my $spell_cb = sub { 544 my $spell_cb = sub {
514 my ($widget, $ev) = @_; 545 my ($widget, $ev) = @_;
515 546
516 if ($ev->{button} == 1) { 547 if ($ev->{button} == 1) {
517 $::CONN->user_send ("ready_skill $name"); 548 $::CONN->user_send ("ready_skill $name");
518 } elsif ($ev->{button} == 2) { 549 } elsif ($ev->{button} == 2) {
519 $::CONN->user_send ("use_skill $name"); 550 $::CONN->user_send ("use_skill $name");
520 } elsif ($ev->{button} == 3) { 551 } elsif ($ev->{button} == 3) {
521 my $shortname = CFPlus::shorten $name, 14; 552 my $shortname = DC::shorten $name, 14;
522 (new CFPlus::UI::Menu 553 (new DC::UI::Menu
523 items => [ 554 items => [
524 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 555 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
525 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 556 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
526 ], 557 ],
527 )->popup ($ev); 558 )->popup ($ev);
528 } else { 559 } else {
529 return 0; 560 return 0;
530 } 561 }
… …
532 1 563 1
533 }; 564 };
534 565
535 my $sw = $self->{skillwid}{$idx} ||= [ 566 my $sw = $self->{skillwid}{$idx} ||= [
536 # exp 567 # exp
537 (new CFPlus::UI::Label 568 (new DC::UI::Label
538 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 569 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
539 570
540 # level 571 # level
541 (new CFPlus::UI::Label 572 (new DC::UI::Label
542 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 573 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
543 574
544 # progress 575 # progress
545 (new CFPlus::UI::ExperienceProgress), 576 (new DC::UI::ExperienceProgress),
546 577
547 # label 578 # label
548 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 579 (new DC::UI::Label text => $name, on_button_down => $spell_cb,
549 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 580 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
550 ]; 581 ];
551 582
552 push @add, 583 push @add,
553 $x * 4 + 0, $y, $sw->[0], 584 $x * 4 + 0, $y, $sw->[0],
554 $x * 4 + 1, $y, $sw->[1], 585 $x * 4 + 1, $y, $sw->[1],
… …
560 } 591 }
561 592
562 $sktbl->add_at (@add); 593 $sktbl->add_at (@add);
563 } 594 }
564 595
565 for (grep exists $stats->{$_}, @skills) { 596 for (@order) {
597 my ($idx, $name) = @$_;
598 my $val = $stats->{$idx};
599
600 next if $prev->{$idx}[1] eq $val->[1];
601
566 my $sw = $self->{skillwid}{$_}; 602 my $sw = $self->{skillwid}{$idx};
567 $sw->[0]->set_text (::formsep ($stats->{$_}[1])); 603 $sw->[0]->set_text (::formsep ($val->[1]));
568 $sw->[1]->set_text ($stats->{$_}[0] * 1); 604 $sw->[1]->set_text ($val->[0] * 1);
569 $sw->[2]->set_value (@{$stats->{$_}}); 605 $sw->[2]->set_value (@$val);
570 }
571}
572 606
573sub macro_send { 607 $::GAUGES->{sklprg}->set_label ("$name %d%%");
574 my ($self, $macro) = @_; 608 $::GAUGES->{sklprg}->set_value (@$val);
575
576 for my $cmd (@{ $macro->{action} }) {
577 $self->send_command ($cmd);
578 } 609 }
579} 610}
580 611
581sub user_send { 612sub user_send {
582 my ($self, $command) = @_; 613 my ($self, $command) = @_;
… …
584 $self->{record}->($command) 615 $self->{record}->($command)
585 if $self->{record}; 616 if $self->{record};
586 617
587 $self->logprint ("send: ", $command); 618 $self->logprint ("send: ", $command);
588 $self->send_command ($command); 619 $self->send_command ($command);
589 ::status ($command);
590} 620}
591 621
592sub record { 622sub record {
593 my ($self, $cb) = @_; 623 my ($self, $cb) = @_;
594 624
… …
625 } 655 }
626 } 656 }
627 657
628 if ($delay) { 658 if ($delay) {
629 # delay the map drawing a tiny bit in the hope of getting the missing fetched 659 # delay the map drawing a tiny bit in the hope of getting the missing fetched
630 Event->timer (after => 0.03, cb => sub { 660 EV::once undef, 0, 0.03, sub {
631 $_[0]->w->cancel;
632 $self->{map_widget}->update; 661 $self->{map_widget}->update
662 if $self->{map_widget};
633 }); 663 };
634 } else { 664 } else {
635 $self->{map_widget}->update; 665 $self->{map_widget}->update;
636 } 666 }
637} 667}
638 668
… …
650 680
651 my ($hash, $x, $y, $w, $h) = @$map_info; 681 my ($hash, $x, $y, $w, $h) = @$map_info;
652 682
653 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 683 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
654 $self->{map_cache_new}{$hash} = \$data; 684 $self->{map_cache_new}{$hash} = \$data;
655 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 685 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
656} 686}
657 687
658sub map_clear { 688sub map_clear {
659 my ($self) = @_; 689 my ($self) = @_;
660 690
… …
673 do { 703 do {
674 $tile = pop @{$self->{bg_fetch}} 704 $tile = pop @{$self->{bg_fetch}}
675 or return; 705 or return;
676 } while $self->{texture}[$tile]; 706 } while $self->{texture}[$tile];
677 707
678 CFPlus::DB::get tilecache => $tile, sub { 708 DC::DB::get tilecache => $tile, sub {
679 my ($data) = @_; 709 my ($data) = @_;
680 710
681 return unless $self->{map}; # stop when destroyed 711 return unless $self->{map}; # stop when destroyed
682 712
683 if (defined $data) { 713 if (defined $data) {
… …
711 }; 741 };
712 742
713 if (my $rdata = $self->{map_cache_old}{$hash}) { 743 if (my $rdata = $self->{map_cache_old}{$hash}) {
714 $cb->($$rdata); 744 $cb->($$rdata);
715 } else { 745 } else {
716 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 746 DC::DB::get $self->{mapcache} => $hash, $cb;
717 } 747 }
718} 748}
719 749
720# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 750# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
721# (server resource,s latency, bandwidth), so this hack is warranted. 751# (server resource,s latency, bandwidth), so this hack is warranted.
… …
845 875
846sub face_find { 876sub face_find {
847 my ($self, $facenum, $face, $cb) = @_; 877 my ($self, $facenum, $face, $cb) = @_;
848 878
849 if ($face->{type} == 0) { # FT_FACE 879 if ($face->{type} == 0) { # FT_FACE
850 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 880 my $id = DC::DB::get_tile_id_sync $face->{name};
851 881
852 $face->{id} = $id; 882 $face->{id} = $id;
853 $self->{map}->set_tileid ($facenum => $id); 883 $self->{map}->set_tileid ($facenum => $id);
854 884
855 CFPlus::DB::get tilecache => $id, $cb; 885 DC::DB::get tilecache => $id, $cb;
856 886
857 } elsif ($face->{type} & 1) { # with metadata 887 } elsif ($face->{type} & 1) { # with metadata
858 CFPlus::DB::get res_meta => $face->{name}, $cb; 888 DC::DB::get res_meta => $face->{name}, $cb;
859 889
860 } else { # no metadata 890 } else { # no metadata
861 CFPlus::DB::get res_data => $face->{name}, $cb; 891 DC::DB::get res_data => $face->{name}, $cb;
862 } 892 }
863} 893}
864 894
865sub face_update { 895sub face_update {
866 my ($self, $facenum, $face, $changed) = @_; 896 my ($self, $facenum, $face, $changed) = @_;
867 897
868 if ($face->{type} == 0) { 898 if ($face->{type} == 0) {
869 # image, FT_FACE 899 # image, FT_FACE
870 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 900 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
871 if $changed; 901 if $changed;
872 902
873 $self->have_tile ($face->{id}, delete $face->{data}); 903 $self->have_tile ($face->{id}, delete $face->{data});
874 904
875 } elsif ($face->{type} & 1) { 905 } elsif ($face->{type} & 1) {
876 # split metadata case, FT_MUSIC, FT_SOUND 906 # split metadata case, FT_MUSIC, FT_SOUND
877 if ($changed) { # new data 907 if ($changed) { # new data
878 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 908 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
879 $face->{data} = $meta; 909 $face->{data} = $meta;
880 910
911 # rely on strict ordering here and also on later fetch
881 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 912 DC::DB::put res_data => $face->{name} => $data, sub { };
882 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 913 DC::DB::put res_meta => $face->{name} => $meta, sub { };
883 } 914 }
884 915
885 $face->{data} = $self->{json_coder}->decode ($face->{data}); 916 $face->{data} = $self->{json_coder}->decode ($face->{data});
886
887 ::add_license ($face); 917 ::add_license ($face);
918 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
919 if $changed;
888 920
889 if ($face->{type} == 3) { # FT_MUSIC 921 if ($face->{type} == 3) { # FT_MUSIC
890 ::message ({ markup => "downloaded song #$facenum" })
891 if $changed;
892
893 &::audio_music_push ($facenum); 922 &::audio_music_push ($facenum);
894 } elsif ($face->{type} == 5) { # FT_SOUND 923 } elsif ($face->{type} == 5) { # FT_SOUND
895 ::message ({ markup => "downloaded sound #$facenum" })
896 if $changed;
897
898 &::audio_sound_push ($facenum); 924 &::audio_sound_push ($facenum);
899 } 925 }
900 926
901 } else { 927 } else {
902 # flat resource case, FT_RSRC 928 # flat resource case, FT_RSRC
903 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 929 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
904 if $changed; 930 if $changed;
905 } 931 }
906 932
907 if (my $cbs = $self->{face_cb}{$facenum}) { 933 if (my $cbs = $self->{face_cb}{$facenum}) {
908 $_->($face, $changed) for @$cbs; 934 $_->($face, $changed) for @$cbs;
… …
919 my ($self, $tile, $data) = @_; 945 my ($self, $tile, $data) = @_;
920 946
921 return unless $self->{map}; 947 return unless $self->{map};
922 948
923 my $tex = $self->{texture}[$tile] ||= 949 my $tex = $self->{texture}[$tile] ||=
924 new CFPlus::Texture 950 new DC::Texture
925 tile => $tile, 951 tile => $tile,
926 image => $data, delete_image => 1, 952 image => $data, delete_image => 1,
927 minify => 1, mipmap => 1; 953 minify => 1, mipmap => 1;
928 954
929 if (my $cbs = delete $self->{tile_cb}{$tile}) { 955 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
937 my ($self, $num, $cb) = @_; 963 my ($self, $num, $cb) = @_;
938 964
939 push @{$self->{face_cb}{$num}}, $cb; 965 push @{$self->{face_cb}{$num}}, $cb;
940 966
941 defined wantarray 967 defined wantarray
942 ? CFPlus::guard { 968 ? DC::guard {
943 @{$self->{face_cb}{$num}} 969 @{$self->{face_cb}{$num}}
944 = grep $_ != $cb, 970 = grep $_ != $cb,
945 @{$self->{face_cb}{$num}}; 971 @{$self->{face_cb}{$num}};
946 } 972 }
947 : () 973 : ()
… …
982 1008
983sub sanitise_xml($) { 1009sub sanitise_xml($) {
984 local $_ = shift; 1010 local $_ = shift;
985 1011
986 # we now weed out all tags we do not support 1012 # we now weed out all tags we do not support
987 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1013 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1014 }{
1015 "&lt;"
1016 }gex;
1017
988 # now all entities 1018 # now all entities
989 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1019 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
990 1020
991 # handle some elements 1021 # handle some elements
992 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1022 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
1045 1075
1046 ## try to create single paragraphs of multiple lines sent by the server 1076 ## try to create single paragraphs of multiple lines sent by the server
1047 # no longer neecssary with TRT servers 1077 # no longer neecssary with TRT servers
1048 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1078 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1049 1079
1080 for (split /\n/, $text) {
1050 ::message ({ 1081 ::message ({
1051 fg => $fg, 1082 fg => $fg,
1052 markup => $_, 1083 markup => $_,
1053 type => $type, 1084 type => $type,
1054 extra => [@extra], 1085 extra => [@extra],
1055 color_flags => $color 1086 color_flags => $color, #d# ugly, kill
1056 }) for split /\n/, $text; 1087 });
1088
1089 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1090 # actually, this is an ugly design. _we_ should control the channels,
1091 # not some random other widget, as the channels are clearly protocol-specific.
1092 # then we could also react to flags such as CLEAR without resorting to
1093 # hacks such as color_flags, above.
1094 }
1057 1095
1058 $self->{statusbox}->add ($text, 1096 $self->{statusbox}->add ($text,
1059 group => $text, 1097 group => $text,
1060 fg => $fg, 1098 fg => $fg,
1061 timeout => $color >= 2 ? 180 : 10, 1099 timeout => $color >= 2 ? 180 : 10,
1062 tooltip_font => $::FONT_FIXED, 1100 tooltip_font => $::FONT_FIXED,
1063 ); 1101 ) if $type eq "info";
1064 } 1102 }
1065} 1103}
1066 1104
1067sub spell_add { 1105sub spell_add {
1068 my ($self, $spell) = @_; 1106 my ($self, $spell) = @_;
… …
1072 $spell->{message} =~ s/\n+$//; 1110 $spell->{message} =~ s/\n+$//;
1073 $spell->{message} ||= "Server did not provide a description for this spell."; 1111 $spell->{message} ||= "Server did not provide a description for this spell.";
1074 1112
1075 $::SPELL_LIST->add_spell ($spell); 1113 $::SPELL_LIST->add_spell ($spell);
1076 1114
1077 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1115 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
1078 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1116 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
1079} 1117}
1080 1118
1081sub spell_delete { 1119sub spell_delete {
1082 my ($self, $spell) = @_; 1120 my ($self, $spell) = @_;
1083 1121
… …
1094sub addme_success { 1132sub addme_success {
1095 my ($self) = @_; 1133 my ($self) = @_;
1096 1134
1097 my %skill_help; 1135 my %skill_help;
1098 1136
1099 for my $node (CFPlus::Pod::find skill_description => "*") { 1137 for my $node (DC::Pod::find skill_description => "*") {
1100 my (undef, @par) = CFPlus::Pod::section_of $node; 1138 my (undef, @par) = DC::Pod::section_of $node;
1101 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1139 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
1102 }; 1140 };
1103 1141
1104 for my $skill (values %{$self->{skill_info}}) { 1142 for my $skill (values %{$self->{skill_info}}) {
1105 $self->{map_widget}->add_command ("ready_skill $skill", 1143 $self->{map_widget}->add_command ("ready_skill $skill",
1106 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1144 (DC::asxml "Ready the skill '$skill'\n\n")
1107 . $skill_help{$skill}); 1145 . $skill_help{$skill});
1108 $self->{map_widget}->add_command ("use_skill $skill", 1146 $self->{map_widget}->add_command ("use_skill $skill",
1109 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1147 (DC::asxml "Immediately use the skill '$skill'\n\n")
1110 . $skill_help{$skill}); 1148 . $skill_help{$skill});
1111 } 1149 }
1112} 1150}
1113 1151
1114sub eof { 1152sub eof {
… …
1118 1156
1119 ::stop_game (); 1157 ::stop_game ();
1120} 1158}
1121 1159
1122sub update_floorbox { 1160sub update_floorbox {
1123 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1161 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1124 return unless $::CONN; 1162 return unless $::CONN;
1125 1163
1126 $::FLOORBOX->clear; 1164 $::FLOORBOX->clear;
1127 1165
1128 my @add; 1166 my @add;
… …
1130 my $row; 1168 my $row;
1131 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1169 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1132 if ($row < 6) { 1170 if ($row < 6) {
1133 local $_->{face_widget}; # hack to force recreation of widget 1171 local $_->{face_widget}; # hack to force recreation of widget
1134 local $_->{desc_widget}; # hack to force recreation of widget 1172 local $_->{desc_widget}; # hack to force recreation of widget
1135 CFPlus::Item::update_widgets $_; 1173 DC::Item::update_widgets $_;
1136 1174
1137 push @add, 1175 push @add,
1138 0, $row, $_->{face_widget}, 1176 0, $row, $_->{face_widget},
1139 1, $row, $_->{desc_widget}; 1177 1, $row, $_->{desc_widget};
1140 1178
1141 $row++; 1179 $row++;
1142 } else { 1180 } else {
1143 push @add, 1, $row, new CFPlus::UI::Button 1181 push @add, 1, $row, new DC::UI::Button
1144 text => "More...", 1182 text => "More...",
1145 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1183 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1146 ; 1184 ;
1147 last; 1185 last;
1148 } 1186 }
1149 } 1187 }
1150 if ($::CONN->{open_container}) { 1188 if ($::CONN->{open_container}) {
1151 push @add, 1, $row++, new CFPlus::UI::Button 1189 push @add, 1, $row++, new DC::UI::Button
1152 text => "Close container", 1190 text => "Close container",
1153 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1191 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1154 ; 1192 ;
1155 } 1193 }
1156 1194
1157 $::FLOORBOX->add_at (@add); 1195 $::FLOORBOX->add_at (@add);
1158 }); 1196 });
1159 1197
1160 $::WANT_REFRESH->start; 1198 $::WANT_REFRESH = 1;
1161} 1199}
1162 1200
1163sub set_opencont { 1201sub set_opencont {
1164 my ($conn, $tag, $name) = @_; 1202 my ($conn, $tag, $name) = @_;
1165 $conn->{open_container} = $tag; 1203 $conn->{open_container} = $tag;
1166 update_floorbox; 1204 update_floorbox;
1167 1205
1168 $::INVR_HB->clear (); 1206 $::INVR_HB->clear ();
1169 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1207 $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name);
1170 1208
1171 if ($tag != 0) { # Floor isn't closable, is it? 1209 if ($tag != 0) { # Floor isn't closable, is it?
1172 $::INVR_HB->add (new CFPlus::UI::Button 1210 $::INVR_HB->add (new DC::UI::Button
1173 text => "Close container", 1211 text => "Close container",
1174 tooltip => "Close the currently open container (if one is open)", 1212 tooltip => "Close the currently open container (if one is open)",
1175 on_activate => sub { 1213 on_activate => sub {
1176 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1214 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1177 if $tag != 0; 1215 if $tag != 0;
… …
1184} 1222}
1185 1223
1186sub update_containers { 1224sub update_containers {
1187 my ($self) = @_; 1225 my ($self) = @_;
1188 1226
1189 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1227 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1190 my $todo = delete $self->{update_container} 1228 my $todo = delete $self->{update_container}
1191 or return; 1229 or return;
1192 1230
1193 for my $tag (keys %$todo) { 1231 for my $tag (keys %$todo) {
1194 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1232 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1231sub item_update { 1269sub item_update {
1232 my ($self, $item) = @_; 1270 my ($self, $item) = @_;
1233 1271
1234 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1272 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
1235 1273
1236 CFPlus::Item::update_widgets $item; 1274 DC::Item::update_widgets $item;
1237 1275
1238 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1276 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1239 set_opencont ($::CONN, 0, "Floor"); 1277 set_opencont ($::CONN, 0, "Floor");
1240 1278
1241 } elsif ($item->{flags} & F_OPEN) { 1279 } elsif ($item->{flags} & F_OPEN) {
1242 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1280 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1243 1281
1244 } else { 1282 } else {
1245 $self->{update_container}{$item->{container}}++; 1283 $self->{update_container}{$item->{container}}++;
1246 $self->update_containers; 1284 $self->update_containers;
1247 } 1285 }
… …
1306 0 1344 0
1307 }); 1345 });
1308 1346
1309 $self->update_server_info; 1347 $self->update_server_info;
1310 1348
1311 $self->send_command ("output-sync $::CFG->{output_sync}");
1312 $self->send_command ("output-count $::CFG->{output_count}");
1313 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1349 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1314 $self->send_command ("pickup $::CFG->{pickup}"); 1350 $self->send_command ("pickup $::CFG->{pickup}");
1315} 1351}
1316 1352
1317sub lookat { 1353sub lookat {
… …
1321 $self->send_ext_req (lookat => $x, $y, sub { 1357 $self->send_ext_req (lookat => $x, $y, sub {
1322 my (%msg) = @_; 1358 my (%msg) = @_;
1323 1359
1324 if (exists $msg{npc_dialog}) { 1360 if (exists $msg{npc_dialog}) {
1325 # start npc chat dialog 1361 # start npc chat dialog
1326 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1362 $self->{npc_dialog} = new DC::NPCDialog::
1327 token => $msg{npc_dialog}, 1363 token => $msg{npc_dialog},
1328 title => "$msg{npc_dialog}[0] (NPC)", 1364 title => "$msg{npc_dialog}[0] (NPC)",
1329 conn => $self, 1365 conn => $self,
1330 ; 1366 ;
1331 } 1367 }
… …
1344 $self->SUPER::destroy; 1380 $self->SUPER::destroy;
1345 1381
1346 %$self = (); 1382 %$self = ();
1347} 1383}
1348 1384
1349package CFPlus::NPCDialog; 1385package DC::NPCDialog;
1350 1386
1351our @ISA = 'CFPlus::UI::Toplevel'; 1387our @ISA = 'DC::UI::Toplevel';
1352 1388
1353sub new { 1389sub new {
1354 my $class = shift; 1390 my $class = shift;
1355 1391
1356 my $self = $class->SUPER::new ( 1392 my $self = $class->SUPER::new (
… …
1363 kw => { hi => 0, yes => 0, no => 0 }, 1399 kw => { hi => 0, yes => 0, no => 0 },
1364 has_close_button => 1, 1400 has_close_button => 1,
1365 @_, 1401 @_,
1366 ); 1402 );
1367 1403
1368 CFPlus::weaken (my $this = $self); 1404 DC::weaken (my $this = $self);
1369 1405
1370 $self->connect (delete => sub { $this->destroy; 1 }); 1406 $self->connect (delete => sub { $this->destroy; 1 });
1371 1407
1372 # better use a pane... 1408 # better use a pane...
1373 $self->add (my $hbox = new CFPlus::UI::HBox); 1409 $self->add (my $hbox = new DC::UI::HBox);
1374 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1410 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1375 1411
1376 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1412 $hbox->add (my $vbox = new DC::UI::VBox);
1377 1413
1378 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1414 $vbox->add (new DC::UI::Label text => "Message Entry:");
1379 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1415 $vbox->add ($self->{entry} = new DC::UI::Entry
1380 tooltip => "#npc_message_entry", 1416 tooltip => "#npc_message_entry",
1381 on_activate => sub { 1417 on_activate => sub {
1382 my ($entry, $text) = @_; 1418 my ($entry, $text) = @_;
1383 1419
1384 return unless $text =~ /\S/; 1420 return unless $text =~ /\S/;
… …
1388 1424
1389 0 1425 0
1390 }, 1426 },
1391 ); 1427 );
1392 1428
1393 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1429 $vbox->add ($self->{options} = new DC::UI::VBox);
1394 1430
1395 $self->{bye_button} = new CFPlus::UI::Button 1431 $self->{bye_button} = new DC::UI::Button
1396 text => "Bye (close)", 1432 text => "Bye (close)",
1397 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1433 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1398 on_activate => sub { $this->destroy; 1 }, 1434 on_activate => sub { $this->destroy; 1 },
1399 ; 1435 ;
1400 1436
… …
1419}; 1455};
1420 1456
1421sub update_options { 1457sub update_options {
1422 my ($self) = @_; 1458 my ($self) = @_;
1423 1459
1424 CFPlus::weaken $self; 1460 DC::weaken $self;
1425 1461
1426 $self->{options}->clear; 1462 $self->{options}->clear;
1427 $self->{options}->add ($self->{bye_button}); 1463 $self->{options}->add ($self->{bye_button});
1428 1464
1429 for my $kw (sort keys %{ $self->{kw} }) { 1465 for my $kw (sort keys %{ $self->{kw} }) {
1430 $self->{options}->add (new CFPlus::UI::Button 1466 $self->{options}->add (new DC::UI::Button
1431 text => $kw, 1467 text => $kw,
1432 on_activate => sub { 1468 on_activate => sub {
1433 $self->send ($kw); 1469 $self->send ($kw);
1434 0 1470 0
1435 }, 1471 },
… …
1438} 1474}
1439 1475
1440sub feed { 1476sub feed {
1441 my ($self, $type, @arg) = @_; 1477 my ($self, $type, @arg) = @_;
1442 1478
1443 CFPlus::weaken $self; 1479 DC::weaken $self;
1444 1480
1445 if ($type eq "update") { 1481 if ($type eq "update") {
1446 my (%info) = @arg; 1482 my (%info) = @arg;
1447 1483
1448 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1484 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1449 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1485 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1450 1486
1451 if (exists $info{msg}) { 1487 if (exists $info{msg}) {
1452 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1488 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1453 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1489 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1454 my @link; 1490 my @link;
1455 $text =~ s{ 1491 $text =~ s{
1456 ($match) 1492 ($match)
1457 }{ 1493 }{
1458 my $kw = $1; 1494 my $kw = $1;
1459 1495
1460 push @link, new CFPlus::UI::Label 1496 push @link, new DC::UI::Label
1461 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1497 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1462 can_hover => 1, 1498 can_hover => 1,
1463 can_events => 1, 1499 can_events => 1,
1464 padding_x => 0, 1500 padding_x => 0,
1465 padding_y => 0, 1501 padding_y => 0,
… …
1483} 1519}
1484 1520
1485sub send { 1521sub send {
1486 my ($self, $msg) = @_; 1522 my ($self, $msg) = @_;
1487 1523
1488 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1524 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1489 $self->{textview}->scroll_to_bottom; 1525 $self->{textview}->scroll_to_bottom;
1490 1526
1491 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1527 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1492} 1528}
1493 1529

Diff Legend

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